Skip to content
Browse files

Fix `assert_redirected_to` does not show user-supplied message.

Issue: when `assert_redirected_to` fails due to the response redirect not
matching the expected redirect the user-supplied message (second parameter)
is not shown. This message is only shown if the response is not a redirect.
  • Loading branch information...
1 parent ac5cc69 commit 0f5ba6e124b583fa0c92fc6e82fff124673d8e0d @907th 907th committed May 30, 2013
View
9 actionpack/CHANGELOG.md
@@ -1,5 +1,14 @@
## unreleased ##
+* Fix `ActionDispatch::Assertions::ResponseAssertions#assert_redirected_to`
+ does not show user-supplied message.
+
+ Issue: when `assert_redirected_to` fails due to the response redirect not
+ matching the expected redirect the user-supplied message (second parameter)
+ is not shown. This message is only shown if the response is not a redirect.
+
+ *Alexey Chernenkov*
+
* Merge `:action` from routing scope and assign endpoint if both `:controller`
and `:action` are present. The endpoint assignment only occurs if there is
no `:to` present in the options hash so should only affect routes using the
View
2 actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -62,7 +62,7 @@ def assert_redirected_to(options = {}, message=nil)
redirect_expected = normalize_argument_to_redirection(options)
if redirect_is != redirect_expected
- flunk "Expected response to be a redirect to <#{redirect_expected}> but was a redirect to <#{redirect_is}>"
+ flunk(build_message(message, "Expected response to be a redirect to <?> but was a redirect to <?>", redirect_expected, redirect_is))
end
end
View
2 actionpack/test/dispatch/routing_assertions_test.rb
@@ -42,7 +42,7 @@ def test_assert_recognizes
def test_assert_recognizes_with_extras
assert_recognizes({ :controller => 'articles', :action => 'index', :page => '1' }, '/articles', { :page => '1' })
end
-
+
def test_assert_recognizes_with_method
assert_recognizes({ :controller => 'articles', :action => 'create' }, { :path => '/articles', :method => :post })
assert_recognizes({ :controller => 'articles', :action => 'update', :id => '1' }, { :path => '/articles/1', :method => :put })

0 comments on commit 0f5ba6e

Please sign in to comment.
Something went wrong with that request. Please try again.