Merge pull request #1559 from koic/fix_incorrect_autocorrect_for_rails_redirect_back_or_to

[Fix #1558] Fix incorrect autocorrect for `Rails/RedirectBackOrTo`

Author: koic

changelog/fix_incorrect_autocorrect_for_rails_redirect_back_or_to.md

@@ -0,0 +1 @@
+* [#1558](https://github.com/rubocop/rubocop-rails/issues/1558): This PR fixes incorrect autocorrect for `Rails/RedirectBackOrTo` when additional options as double splat are used. ([@koic][])

lib/rubocop/cop/rails/redirect_back_or_to.rb

@@ -33,33 +33,36 @@ class RedirectBackOrTo < Base
 
         def_node_matcher :redirect_back_with_fallback_location, <<~PATTERN
           (send nil? :redirect_back
-            (hash <$(pair (sym :fallback_location) $_) ...>)
+            (hash <$(pair (sym :fallback_location) $_) $...>)
           )
         PATTERN
 
         def on_send(node)
-          redirect_back_with_fallback_location(node) do |fallback_pair, fallback_value|
+          redirect_back_with_fallback_location(node) do |fallback_pair, fallback_value, options|
             add_offense(node.loc.selector) do |corrector|
-              correct_redirect_back(corrector, node, fallback_pair, fallback_value)
+              correct_redirect_back(corrector, node, fallback_pair, fallback_value, options)
             end
           end
         end
 
         private
 
-        def correct_redirect_back(corrector, node, fallback_pair, fallback_value)
+        # rubocop:disable Metrics/AbcSize
+        def correct_redirect_back(corrector, node, fallback_pair, fallback_value, options)
           corrector.replace(node.loc.selector, 'redirect_back_or_to')
 
           hash_arg = node.first_argument
 
           if hash_arg.pairs.one?
-            corrector.replace(hash_arg, fallback_value.source)
+            arguments = [fallback_value.source] + options.map(&:source)
+            corrector.replace(hash_arg, arguments.join(', '))
           else
             remove_fallback_location_pair(corrector, hash_arg, fallback_pair)
             first_pair = hash_arg.pairs.find { |pair| pair != fallback_pair }
             corrector.insert_before(first_pair, "#{fallback_value.source}, ")
           end
         end
+        # rubocop:enable Metrics/AbcSize
 
         def remove_fallback_location_pair(corrector, hash_node, fallback_pair)
           pairs = hash_node.pairs

spec/rubocop/cop/rails/redirect_back_or_to_spec.rb

@@ -24,6 +24,17 @@
       RUBY
     end
 
+    it 'registers an offense and corrects with additional options as double splat' do
+      expect_offense(<<~RUBY)
+        redirect_back(fallback_location: root_path, **options)
+        ^^^^^^^^^^^^^ Use `redirect_back_or_to` instead of `redirect_back` with `:fallback_location` keyword argument.
+      RUBY
+
+      expect_correction(<<~RUBY)
+        redirect_back_or_to(root_path, **options)
+      RUBY
+    end
+
     it 'registers no offense when using redirect_back_or_to' do
       expect_no_offenses(<<~RUBY)
         redirect_back_or_to(root_path)