Merge pull request rails#46133 from nvasilevski/keep-backwards-compatibility-for-assert-redirected-to

Keep backwards compatibility for `assert_redirected_to`

Author: byroot

actionpack/lib/action_dispatch/testing/assertions/response.rb

@@ -55,7 +55,7 @@ def assert_response(type, message = nil)
       #   # Permanently).
       #   assert_redirected_to "/some/path", status: :moved_permanently
       def assert_redirected_to(url_options = {}, options = {}, message = nil)
-        options, message = message, nil if message.is_a?(Hash) && options.empty?
+        options, message = {}, options unless options.is_a?(Hash)
 
         status = options[:status] || :redirect
         assert_response(status, message)

actionpack/test/controller/action_pack_assertions_test.rb

@@ -442,6 +442,14 @@ def test_assert_redirection_with_symbol
     }
   end
 
+  def test_assert_redirection_with_custom_message
+    error = assert_raise(ActiveSupport::TestCase::Assertion) do
+      assert_redirected_to "http://test.host/some/path", "wrong redirect"
+    end
+
+    assert_equal("wrong redirect", error.message)
+  end
+
   def test_assert_redirection_with_status
     process :redirect_to_path
     assert_redirected_to "http://test.host/some/path", status: :found