aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2006-03-19 03:50:14 +0000
committerRick Olson <technoweenie@gmail.com>2006-03-19 03:50:14 +0000
commit891a962a192bdd7eb0402b41e11a5e5657fe961c (patch)
tree2f34ec037e56a8fa6e537adb15faafba0e5dd17d /actionpack/lib
parent9038303af0a634a3ac9ae8234d121a1815960d2e (diff)
downloadrails-891a962a192bdd7eb0402b41e11a5e5657fe961c.tar.gz
rails-891a962a192bdd7eb0402b41e11a5e5657fe961c.tar.bz2
rails-891a962a192bdd7eb0402b41e11a5e5657fe961c.zip
Added nicer message for assert_redirected_to (closes #4294) [court3nay, Chris McGrath]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3969 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/assertions.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/assertions.rb b/actionpack/lib/action_controller/assertions.rb
index b3f2c235d6..2402e0941b 100644
--- a/actionpack/lib/action_controller/assertions.rb
+++ b/actionpack/lib/action_controller/assertions.rb
@@ -85,8 +85,9 @@ module Test #:nodoc:
assert_equal(eurl, url, msg) if eurl && url
assert_equal(epath, path, msg) if epath && path
else
- msg = build_message(message, "response is not a redirection to all of the options supplied (redirection is <?>)",
- @response.redirected_to || @response.redirect_url)
+ @response_diff = options.diff(@response.redirected_to) if @response.redirected_to
+ msg = build_message(message, "response is not a redirection to all of the options supplied (redirection is <?>), difference: <?>",
+ @response.redirected_to || @response.redirect_url, @response_diff)
assert_block(msg) do
if options.is_a?(Symbol)