github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactored 'assert_redirected_to': local call to validate_request! will be called in assert_response already. changed names of local variables in order to recognize the semantics a bit easier.

Browse Source
This commit is contained in:
thoefer
2011-07-26 11:42:53 +02:00
parent b4e577945b
commit 3bfcf5ffc8
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
actionpack/lib/action_dispatch/testing/assertions/response.rb
View File

@@ -55,16 +55,15 @@ module ActionDispatch
# assert_redirected_to @customer
#
def assert_redirected_to(options = {}, message=nil)
validate_request!
assert_response(:redirect, message)
return true if options == @response.location
redirected_to_after_normalization = normalize_argument_to_redirection(@response.location)
options_after_normalization = normalize_argument_to_redirection(options)
redirect_is = normalize_argument_to_redirection(@response.location)
redirect_expected = normalize_argument_to_redirection(options)
if redirected_to_after_normalization != options_after_normalization
flunk "Expected response to be a redirect to <#{options_after_normalization}> but was a redirect to <#{redirected_to_after_normalization}>"
if redirect_is != redirect_expected
flunk "Expected response to be a redirect to <#{redirect_expected}> but was a redirect to <#{redirect_is}>"
end
end