Merge pull request #1382 from masato-bkn/fix-redundant_active_record_…

…all_method Fix false negatives for `Rails/RedundantActiveRecordAllMethod` when using `POSSIBLE_ENUMERABLE_BLOCK_METHODS` in a block
rubocop · Oct 29, 2024 · ad3287a · ad3287a
2 parents 1d7f0c4 + 2d7e7a0
commit ad3287a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/changelog/fix_fix_false_negatives_for_ rails_redundant_active_record_all_method.md b/changelog/fix_fix_false_negatives_for_ rails_redundant_active_record_all_method.md
@@ -0,0 +1 @@
+* [#1382](https://github.com/rubocop/rubocop-rails/pull/1382): Fix false negatives for `Rails/RedundantActiveRecordAllMethod` when using `all` method in block. ([@masato-bkn][])
diff --git a/lib/rubocop/cop/rails/redundant_active_record_all_method.rb b/lib/rubocop/cop/rails/redundant_active_record_all_method.rb
@@ -174,7 +174,7 @@ def possible_enumerable_block_method?(node)
           parent = node.parent
           return false unless POSSIBLE_ENUMERABLE_BLOCK_METHODS.include?(parent.method_name)
 
-          parent.parent&.block_type? || parent.parent&.numblock_type? || parent.first_argument&.block_pass_type?
+          parent.block_literal? || parent.first_argument&.block_pass_type?
         end
 
         def sensitive_association_method?(node)

diff --git a/spec/rubocop/cop/rails/redundant_active_record_all_method_spec.rb b/spec/rubocop/cop/rails/redundant_active_record_all_method_spec.rb
@@ -334,6 +334,13 @@
           User.all.#{method}(&:do_something)
         RUBY
       end
+
+      it "registers an offense when using `#{method}` in block" do
+        expect_offense(<<~RUBY)
+          do_something { User.all.#{method} }
+                              ^^^ Redundant `all` detected.
+        RUBY
+      end
     end
   end