Merge pull request #866 from r7kamura/feature/fix-const-nil-cbase

Fix false-positives when constant is used with receiver on `Rails/DurationArithmetic`, `Rails/IndexBy`, `Rails/IndexWIth`, and `Rails/RequireDependency`

Author: koic

changelog/fix_false_positives_when_constant_is_used_with_receiver.md

@@ -0,0 +1 @@
+* [#866](https://github.com/rubocop/rubocop-rails/pull/866): Fix false-positives when constant is used with receiver on `Rails/DurationArithmetic`, `Rails/IndexBy`, `Rails/IndexWIth`, and `Rails/RequireDependency`. ([@r7kamura][])

lib/rubocop/cop/rails/duration_arithmetic.rb

@@ -70,8 +70,8 @@ class DurationArithmetic < Base
         #   @return [Boolean] true if matches
         def_node_matcher :time_current?, <<~PATTERN
           {
-            (send (const _ :Time) :current)
-            (send (send (const _ :Time) :zone) :now)
+            (send (const {nil? cbase} :Time) :current)
+            (send (send (const {nil? cbase} :Time) :zone) :now)
           }
         PATTERN
 

lib/rubocop/cop/rails/index_by.rb

@@ -46,7 +46,7 @@ class IndexBy < Base
 
         def_node_matcher :on_bad_hash_brackets_map, <<~PATTERN
           (send
-            (const _ :Hash)
+            (const {nil? cbase} :Hash)
             :[]
             (block
               (call _ {:map :collect})

lib/rubocop/cop/rails/index_with.rb

@@ -49,7 +49,7 @@ class IndexWith < Base
 
         def_node_matcher :on_bad_hash_brackets_map, <<~PATTERN
           (send
-            (const _ :Hash)
+            (const {nil? cbase} :Hash)
             :[]
             (block
               (call _ {:map :collect})

lib/rubocop/cop/rails/require_dependency.rb

@@ -26,7 +26,7 @@ class RequireDependency < Base
         RESTRICT_ON_SEND = %i[require_dependency].freeze
 
         def_node_matcher :require_dependency_call?, <<~PATTERN
-          (send {nil? (const _ :Kernel)} :require_dependency _)
+          (send {nil? (const {nil? cbase} :Kernel)} :require_dependency _)
         PATTERN
 
         def on_send(node)

spec/rubocop/cop/rails/duration_arithmetic_spec.rb

@@ -97,4 +97,32 @@
       created_at - 1.minute
     RUBY
   end
+
+  it 'does not register an offense for `Foo::Time.current`' do
+    expect_no_offenses(<<~RUBY)
+      Foo::Time.current + 1.hour
+    RUBY
+  end
+
+  it 'registers and correct an offense for `::Time.current`' do
+    expect_offense(<<~RUBY)
+      ::Time.current + 1.hour
+      ^^^^^^^^^^^^^^^^^^^^^^^ Do not add or subtract duration.
+    RUBY
+
+    expect_correction(<<~RUBY)
+      1.hour.from_now
+    RUBY
+  end
+
+  it 'registers and correct an offense for `::Time.zone.now`' do
+    expect_offense(<<~RUBY)
+      ::Time.zone.now + 1.hour
+      ^^^^^^^^^^^^^^^^^^^^^^^^ Do not add or subtract duration.
+    RUBY
+
+    expect_correction(<<~RUBY)
+      1.hour.from_now
+    RUBY
+  end
 end

spec/rubocop/cop/rails/index_by_spec.rb

@@ -156,6 +156,12 @@
     RUBY
   end
 
+  it 'does not register an offense for `Foo::Hash[map { ... }]`' do
+    expect_no_offenses(<<~RUBY)
+      Foo::Hash[x.map { |el| [el.to_sym, el] }]
+    RUBY
+  end
+
   context 'when using Ruby 2.6 or newer', :ruby26 do
     it 'registers an offense for `to_h { ... }`' do
       expect_offense(<<~RUBY)

spec/rubocop/cop/rails/index_with_spec.rb

@@ -129,6 +129,12 @@
       RUBY
     end
 
+    it 'does not register an offense for `Foo::Hash[map { ... }]`' do
+      expect_no_offenses(<<~RUBY)
+        Foo::Hash[x.map { |el| [el, el.to_sym] }]
+      RUBY
+    end
+
     context 'when using Ruby 2.6 or newer', :ruby26 do
       it 'registers an offense for `to_h { ... }`' do
         expect_offense(<<~RUBY)

spec/rubocop/cop/rails/require_dependency_spec.rb

@@ -19,11 +19,39 @@
 
   context 'when require_dependency' do
     context 'when using Rails 6.0 or newer', :rails60 do
-      it 'registers an offense' do
-        expect_offense(<<~RUBY)
-          require_dependency 'foo'
-          ^^^^^^^^^^^^^^^^^^^^^^^^ Do not use `require_dependency` with Zeitwerk mode.
-        RUBY
+      context 'without receiver' do
+        it 'registers an offense' do
+          expect_offense(<<~RUBY)
+            require_dependency 'foo'
+            ^^^^^^^^^^^^^^^^^^^^^^^^ Do not use `require_dependency` with Zeitwerk mode.
+          RUBY
+        end
+      end
+
+      context 'with `Kernel` as receiver' do
+        it 'registers an offense' do
+          expect_offense(<<~RUBY)
+            Kernel.require_dependency 'foo'
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Do not use `require_dependency` with Zeitwerk mode.
+          RUBY
+        end
+      end
+
+      context 'with `::Kernel` as receiver' do
+        it 'registers an offense' do
+          expect_offense(<<~RUBY)
+            ::Kernel.require_dependency 'foo'
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Do not use `require_dependency` with Zeitwerk mode.
+          RUBY
+        end
+      end
+
+      context 'with `Foo::Kernel` as receiver' do
+        it 'does not register an offense' do
+          expect_no_offenses(<<~RUBY)
+            Foo::Kernel.require_dependency 'foo'
+          RUBY
+        end
       end
     end