Merge commit 'rails/master'

1 files changed, 3 insertions, 14 deletions

diff --git a/actionpack/lib/action_dispatch/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
index a72ce9084f..501a7c4dfb 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -31,13 +31,7 @@ module ActionDispatch
         elsif type.is_a?(Symbol) && @response.response_code == ActionDispatch::StatusCodes::SYMBOL_TO_STATUS_CODE[type]
           assert_block("") { true } # to count the assertion
         else
-          if @controller && @response.error?
-            exception = @controller.template.instance_variable_get(:@exception)
-            exception_message = exception && exception.message
-            assert_block(build_message(message, "Expected response to be a <?>, but was <?>\n<?>", type, @response.response_code, exception_message.to_s)) { false }
-          else
-            assert_block(build_message(message, "Expected response to be a <?>, but was <?>", type, @response.response_code)) { false }
-          end
+          assert_block(build_message(message, "Expected response to be a <?>, but was <?>", type, @response.response_code)) { false }
         end
       end
 
@@ -60,14 +54,9 @@ module ActionDispatch
         validate_request!
 
         assert_response(:redirect, message)
-        return true if options == @response.redirected_to
-
-        # Support partial arguments for hash redirections
-        if options.is_a?(Hash) && @response.redirected_to.is_a?(Hash)
-          return true if options.all? {|(key, value)| @response.redirected_to[key] == value}
-        end
+        return true if options == @response.location
 
-        redirected_to_after_normalisation = normalize_argument_to_redirection(@response.redirected_to)
+        redirected_to_after_normalisation = normalize_argument_to_redirection(@response.location)
         options_after_normalisation       = normalize_argument_to_redirection(options)
 
         if redirected_to_after_normalisation != options_after_normalisation