diff options
author | Jon Atack <jonnyatack@gmail.com> | 2015-12-06 15:14:27 +0100 |
---|---|---|
committer | Jon Atack <jonnyatack@gmail.com> | 2015-12-11 18:18:08 +0100 |
commit | c6fe614e45a4ae40bb635c1259423ef9e776dd40 (patch) | |
tree | f287143266e01ee05a1a16251fc8ccf2b1b2b823 /actionpack/test/assertions | |
parent | c2e70ca9b042a3461aac0dc073a80e84bd77eb57 (diff) | |
download | rails-c6fe614e45a4ae40bb635c1259423ef9e776dd40.tar.gz rails-c6fe614e45a4ae40bb635c1259423ef9e776dd40.tar.bz2 rails-c6fe614e45a4ae40bb635c1259423ef9e776dd40.zip |
Show redirect response code in assert_response messages
Follow-up to PR #19977, which helpfully added the redirection path to the error message of assert_response if response is a redirection, but which removed the response code, obscuring the type of redirect.
This PR:
- brings back the response code in the error message,
- updates the tests so the new messages can be tested,
- and adds test cases for the change.
Diffstat (limited to 'actionpack/test/assertions')
-rw-r--r-- | actionpack/test/assertions/response_assertions_test.rb | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/actionpack/test/assertions/response_assertions_test.rb b/actionpack/test/assertions/response_assertions_test.rb index 00fb1c0f12..e76c222824 100644 --- a/actionpack/test/assertions/response_assertions_test.rb +++ b/actionpack/test/assertions/response_assertions_test.rb @@ -64,14 +64,35 @@ module ActionDispatch } end - def test_message_when_response_is_redirect_but_asserted_for_status_other_than_redirect - @response = FakeResponse.new :redirection, "http://test.host/posts/redirect/1" - error = assert_raises(Minitest::Assertion) do - assert_response :success - end + def test_error_message_shows_404_when_404_asserted_for_success + @response = ActionDispatch::Response.new + @response.status = 404 + + error = assert_raises(Minitest::Assertion) { assert_response :success } + expected = "Expected response to be a <success>, but was a <404>" + assert_match expected, error.message + end + + def test_error_message_shows_302_redirect_when_302_asserted_for_success + @response = ActionDispatch::Response.new + @response.status = 302 + @response.location = 'http://test.host/posts/redirect/1' + + error = assert_raises(Minitest::Assertion) { assert_response :success } + expected = "Expected response to be a <success>, but was a <302>" \ + " redirect to <http://test.host/posts/redirect/1>" + assert_match expected, error.message + end + + def test_error_message_shows_302_redirect_when_302_asserted_for_301 + @response = ActionDispatch::Response.new + @response.status = 302 + @response.location = 'http://test.host/posts/redirect/2' - expected = "Expected response to be a <success>, but was a redirect to <http://test.host/posts/redirect/1>" - assert_equal expected, error.message + error = assert_raises(Minitest::Assertion) { assert_response 301 } + expected = "Expected response to be a <301>, but was a <302>" \ + " redirect to <http://test.host/posts/redirect/2>" + assert_match expected, error.message end end end |