Merge pull request #625 from koic/fix_a_false_positive_for_rails_redundant_presence_validation_on_belongs_to

[Fix #620] Fix a false positive for `Rails/RedundantPresenceValidationOnBelongsTo`

Author: koic

changelog/fix_a_false_positive_for_rails_redundant_presence_validation_on_belongs_to.md

@@ -0,0 +1 @@
+* [#620](https://github.com/rubocop/rubocop-rails/issues/620): Fix a false positive for `Rails/RedundantPresenceValidationOnBelongsTo` using presence with a message. ([@koic][])

lib/rubocop/cop/rails/redundant_presence_validation_on_belongs_to.rb

@@ -50,9 +50,6 @@ class RedundantPresenceValidationOnBelongsTo < Base
         #   @example source that matches - by association
         #     validates :name, :user, presence: true
         #
-        #   @example source that matches - with presence options
-        #     validates :user, presence: { message: 'duplicate' }
-        #
         #   @example source that matches - by a foreign key
         #     validates :user_id, presence: true
         #
@@ -66,7 +63,7 @@ class RedundantPresenceValidationOnBelongsTo < Base
             send nil? :validates
             (sym $_)+
             $[
-              (hash <$(pair (sym :presence) {true hash}) ...>)  # presence: true
+              (hash <$(pair (sym :presence) true) ...>)         # presence: true
               !(hash <$(pair (sym :strict) {true const}) ...>)  # strict: true
             ]
           )

spec/rubocop/cop/rails/redundant_presence_validation_on_belongs_to_spec.rb

@@ -173,15 +173,10 @@ class Profile
         RUBY
       end
 
-      it 'registers an offense for presence with a message' do
-        expect_offense(<<~RUBY)
+      it 'does not register an offense for presence with a message' do
+        expect_no_offenses(<<~RUBY)
           belongs_to :user
           validates :user, presence: { message: 'Must be present' }
-                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Remove explicit presence validation for `user`.
-        RUBY
-
-        expect_correction(<<~RUBY)
-          belongs_to :user
         RUBY
       end