Merge pull request rubocop#530 from koic/fix_a_false_positive_for_rai…

…ls_has_many_or_has_one_dependent

[Fix rubocop#528] Fix a false positive for `Rails/HasManyOrHasOneDependent`

CHANGELOG.md

@@ -8,6 +8,10 @@
 * [#520](https://github.com/rubocop/rubocop-rails/pull/520): Support auto-correction for `Rails/ScopeArgs`. ([@koic][])
 * [#524](https://github.com/rubocop/rubocop-rails/pull/524): Add new `Rails/RedundantTravelBack` cop. ([@koic][])
 
+### Bug fixes
+
+* [#528](https://github.com/rubocop/rubocop-rails/issues/528): Fix a false positive for `Rails/HasManyOrHasOneDependent` when specifying `:dependent` strategy with double splat. ([@koic][])
+
 ## Changes
 
 * [#260](https://github.com/rubocop/rubocop-rails/issues/260): Change target of `Rails/ContentTag` from `content_tag` method to `tag` method. ([@tabuchi0919][])

lib/rubocop/cop/rails/has_many_or_has_one_dependent.rb

@@ -114,6 +114,8 @@ def contain_valid_options_in_with_options_block?(node)
         end
 
         def valid_options?(options)
+          options = options.first.children.first.pairs if options.first.kwsplat_type?
+
           return true unless options
           return true if options.any? do |o|
             dependent_option?(o) || present_option?(o)

spec/rubocop/cop/rails/has_many_or_has_one_dependent_spec.rb

@@ -28,6 +28,14 @@ class Person < ApplicationRecord
       RUBY
     end
 
+    it 'does not register an offense when specifying `:dependent` strategy with double splat' do
+      expect_no_offenses(<<~RUBY)
+        class Person < ApplicationRecord
+          has_one :foo, **{dependent: :destroy}
+        end
+      RUBY
+    end
+
     it 'does not register an offense when specifying default `dependent: nil` strategy' do
       expect_no_offenses(<<~RUBY)
         class Person < ApplicationRecord