diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-09-22 23:10:41 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-09-22 23:10:41 +0000 |
| commit | ee45d76df80a86961dd44f8526b0ac97bc98ce60 (patch) | |
| tree | a9f5e71ae9c650d560d33439a449e4fb1e3b363f /actionpack/lib | |
| parent | 1abe5a2dedc25d0dcfdff74c65aebc20ccf3011f (diff) | |
| download | rails-ee45d76df80a86961dd44f8526b0ac97bc98ce60.tar.gz rails-ee45d76df80a86961dd44f8526b0ac97bc98ce60.tar.bz2 rails-ee45d76df80a86961dd44f8526b0ac97bc98ce60.zip | |
Roll back #7578, tests failed
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7580 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/assertions/response_assertions.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/assertions/response_assertions.rb b/actionpack/lib/action_controller/assertions/response_assertions.rb index a2831aff67..f45727f508 100644 --- a/actionpack/lib/action_controller/assertions/response_assertions.rb +++ b/actionpack/lib/action_controller/assertions/response_assertions.rb @@ -78,8 +78,9 @@ module ActionController url[key] = value end - @response_diff = url[:actual].diff(url[:expected]) if url[:actual] - msg = build_message(message, "expected a redirect to <?>, found one to <?>, a difference of <?> ", url[:expected], url[:actual], @response_diff) + @response_diff = url[:expected].diff(url[:actual]) if url[:actual] + msg = build_message(message, "response is not a redirection to all of the options supplied (redirection is <?>), difference: <?>", + url[:actual], @response_diff) assert_block(msg) do url[:expected].keys.all? do |k| |