Merge pull request #814 from PedroAugustoRamalhoDuarte/fix/fixes_false_negative_for_rails_redundant_presence_validation_on_belongs_to

[Fix #792] Fixes a false negative for Rails/RedundantPresenceValidationOnBelongsTo

Author: koic

changelog/fix_a_false_negative_for_rails_redundant_presence_validation_on_belongs_to.md

@@ -0,0 +1 @@
+* [#792](https://github.com/rubocop/rubocop-rails/issues/792): Fix a false negative for `Rails/RedundantPresenceValidationOnBelongsTo` when belongs_to at least one block and one hash like `belongs_to :company, -> { where(foo: true) }, inverse_of: :employee`. ([@PedroAugustoRamalhoDuarte][])

lib/rubocop/cop/rails/redundant_presence_validation_on_belongs_to.rb

@@ -143,7 +143,7 @@ class RedundantPresenceValidationOnBelongsTo < Base
         def_node_matcher :belongs_to_without_fk?, <<~PATTERN
           {
             (send nil? :belongs_to (sym %1))        # belongs_to :user
-            (send nil? :belongs_to (sym %1) !hash)  # belongs_to :user, -> { not_deleted }
+            (send nil? :belongs_to (sym %1) !hash ...)  # belongs_to :user, -> { not_deleted }
             (send nil? :belongs_to (sym %1) !(hash <(pair (sym :foreign_key) _) ...>))
           }
         PATTERN

spec/rubocop/cop/rails/redundant_presence_validation_on_belongs_to_spec.rb

@@ -180,6 +180,14 @@ class Profile
         RUBY
       end
 
+      it 'registers an offense for multiple attributes and options in belongs_to' do
+        expect_offense(<<~RUBY)
+          belongs_to :user, -> { where(foo: true) }, inverse_of: :employee
+          validates :user_id, presence: true
+                              ^^^^^^^^^^^^^^ Remove explicit presence validation for `user_id`.
+        RUBY
+      end
+
       pending 'registers an offense even when the presence option is factored out' do
         expect_offense(<<~RUBY)
           belongs_to :user