diff options
| author | Alexey Chernenkov <laise@pisem.net> | 2013-05-30 20:05:13 +0600 |
|---|---|---|
| committer | Alexey Chernenkov <laise@pisem.net> | 2013-07-18 10:54:36 +0600 |
| commit | 0f5ba6e124b583fa0c92fc6e82fff124673d8e0d (patch) | |
| tree | 6d8c11c51ccffd60707fc8f64bcb20f501a12abb | |
| parent | ac5cc6957142f2b22eee0f86710fa18f60313aec (diff) | |
| download | rails-0f5ba6e124b583fa0c92fc6e82fff124673d8e0d.tar.gz rails-0f5ba6e124b583fa0c92fc6e82fff124673d8e0d.tar.bz2 rails-0f5ba6e124b583fa0c92fc6e82fff124673d8e0d.zip | |
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.
| -rw-r--r-- | actionpack/CHANGELOG.md | 9 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/response.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/dispatch/routing_assertions_test.rb | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index ac260a9592..28bacd392b 100644 --- a/actionpack/CHANGELOG.md +++ b/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 diff --git a/actionpack/lib/action_dispatch/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb index 6886ff2a03..cd3329c3a5 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/response.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb @@ -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 diff --git a/actionpack/test/dispatch/routing_assertions_test.rb b/actionpack/test/dispatch/routing_assertions_test.rb index 9f95d82129..423eeda92c 100644 --- a/actionpack/test/dispatch/routing_assertions_test.rb +++ b/actionpack/test/dispatch/routing_assertions_test.rb @@ -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 }) |