Change Rails/IgnoredSkipActionFilterOption to handle multiple callb…

…acks
rubocop · Jun 29, 2024 · cc7f6b2 · cc7f6b2
1 parent a6c20ed
commit cc7f6b2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/changelog/change_ignored_skip_action_filter_option_multiple_callbacks.md b/changelog/change_ignored_skip_action_filter_option_multiple_callbacks.md
@@ -0,0 +1 @@
+* [#1303](https://github.com/rubocop/rubocop-rails/pull/1303): Change `Rails/IgnoredSkipActionFilterOption` to handle multiple callbacks. ([@fatkodima][])
diff --git a/lib/rubocop/cop/rails/ignored_skip_action_filter_option.rb b/lib/rubocop/cop/rails/ignored_skip_action_filter_option.rb
@@ -52,7 +52,7 @@ class IgnoredSkipActionFilterOption < Base
           (send
             nil?
             {#{FILTERS.join(' ')}}
-            _
+            ...
             $_)
         PATTERN
 

diff --git a/spec/rubocop/cop/rails/ignored_skip_action_filter_option_spec.rb b/spec/rubocop/cop/rails/ignored_skip_action_filter_option_spec.rb
@@ -12,6 +12,17 @@
     RUBY
   end
 
+  it 'registers an offense for multiple actions when `if` and `only` are used together' do
+    expect_offense(<<~RUBY)
+      skip_before_action :login_required, :another_action, only: :show, if: :trusted_origin?
+                                                                        ^^^^^^^^^^^^^^^^^^^^ `if` option will be ignored when `only` and `if` are used together.
+    RUBY
+
+    expect_correction(<<~RUBY)
+      skip_before_action :login_required, :another_action, only: :show
+    RUBY
+  end
+
   it 'registers an offense when `if` and `except` are used together' do
     expect_offense(<<~RUBY)
       skip_before_action :login_required, except: :admin, if: :trusted_origin?