mirror of
https://github.com/github/rails.git
synced 2026-01-09 14:48:01 -05:00
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.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -62,7 +62,7 @@ module ActionDispatch
|
||||
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
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ class RoutingAssertionsTest < ActionController::TestCase
|
||||
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 })
|
||||
|
||||
Reference in New Issue
Block a user