diff options
| author | rick <technoweenie@gmail.com> | 2008-07-06 13:58:07 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-07-06 13:58:07 -0700 |
| commit | e939f60b6cac13219b927f13165e4fbd85445254 (patch) | |
| tree | 334815893d98e7980ee7375f76d7493a8ddfeb0e /actionpack | |
| parent | afa0c7f728a8896c9ee9d932033e08a4c99dfd50 (diff) | |
| parent | 74596233f1af1b2fc0c42fbee089c46aaf302514 (diff) | |
| download | rails-e939f60b6cac13219b927f13165e4fbd85445254.tar.gz rails-e939f60b6cac13219b927f13165e4fbd85445254.tar.bz2 rails-e939f60b6cac13219b927f13165e4fbd85445254.zip | |
Merge branch 'assert_redirected_to_fix'
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/assertions/response_assertions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/assertions/response_assertions.rb b/actionpack/lib/action_controller/assertions/response_assertions.rb index 3ecaee641f..e8a49b2fa6 100644 --- a/actionpack/lib/action_controller/assertions/response_assertions.rb +++ b/actionpack/lib/action_controller/assertions/response_assertions.rb @@ -66,7 +66,7 @@ module ActionController redirected_to_after_normalisation = normalize_argument_to_redirection(@response.redirected_to) options_after_normalisation = normalize_argument_to_redirection(options) - assert_equal redirected_to_after_normalisation, options_after_normalisation, + assert_equal options_after_normalisation, redirected_to_after_normalisation, "Expected response to be a redirect to <#{options_after_normalisation}> but was a redirect to <#{redirected_to_after_normalisation}>" end end |