Merge pull request #1562 from koic/fix_incorrect_autocorrect_for_rails_redirect_back_or_to_cop

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

Author: koic

changelog/fix_incorrect_autocorrect_for_rails_redirect_back_or_to_cop.md

@@ -0,0 +1 @@
+* [#1561](https://github.com/rubocop/rubocop-rails/issues/1561): Fix incorrect autocorrect for `Rails/RedirectBackOrTo` when `fallback_location` argument is a hash and the call has no argument parentheses. ([@koic][])

lib/rubocop/cop/rails/redirect_back_or_to.rb

@@ -61,6 +61,8 @@ def correct_redirect_back(corrector, node, fallback_pair, fallback_value, option
             first_pair = hash_arg.pairs.find { |pair| pair != fallback_pair }
             corrector.insert_before(first_pair, "#{fallback_value.source}, ")
           end
+
+          wrap_with_parentheses(node, corrector) unless node.parenthesized?
         end
         # rubocop:enable Metrics/AbcSize
 
@@ -77,6 +79,11 @@ def remove_fallback_location_pair(corrector, hash_node, fallback_pair)
           end
         end
 
+        def wrap_with_parentheses(node, corrector)
+          corrector.replace(node.loc.selector.end.join(node.first_argument.source_range.begin), '(')
+          corrector.insert_after(node, ')')
+        end
+
         def remove_first_pair(corrector, fallback_pair, next_pair)
           range = fallback_pair.source_range.join(next_pair.source_range.begin)
           corrector.remove(range)

spec/rubocop/cop/rails/redirect_back_or_to_spec.rb

@@ -35,6 +35,28 @@
       RUBY
     end
 
+    it 'registers an offense and corrects when `fallback_location` arg is a hash and the call has no arg parentheses' do
+      expect_offense(<<~RUBY)
+        redirect_back fallback_location: {action: 'index'}
+        ^^^^^^^^^^^^^ Use `redirect_back_or_to` instead of `redirect_back` with `:fallback_location` keyword argument.
+      RUBY
+
+      expect_correction(<<~RUBY)
+        redirect_back_or_to({action: 'index'})
+      RUBY
+    end
+
+    it 'registers an offense and corrects when `fallback_location` arg is a hash and the call uses arg parentheses' do
+      expect_offense(<<~RUBY)
+        redirect_back(fallback_location: {action: 'index'})
+        ^^^^^^^^^^^^^ Use `redirect_back_or_to` instead of `redirect_back` with `:fallback_location` keyword argument.
+      RUBY
+
+      expect_correction(<<~RUBY)
+        redirect_back_or_to({action: 'index'})
+      RUBY
+    end
+
     it 'registers no offense when using redirect_back_or_to' do
       expect_no_offenses(<<~RUBY)
         redirect_back_or_to(root_path)