aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/integration_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-05-06 02:09:10 -0700
committerJosé Valim <jose.valim@gmail.com>2012-05-06 02:09:10 -0700
commit13811eef778d45469c81e69aaf04fb76d39fae22 (patch)
treed79f73c120ec40086b2b6731ebda40e2531a8754 /actionpack/test/controller/integration_test.rb
parentbad119cae5ff6f3d27d82b9bdc9fc3cf4f67d271 (diff)
parent6471ced656ad0e61f12b2a7d6f51ef5b2408e64a (diff)
downloadrails-13811eef778d45469c81e69aaf04fb76d39fae22.tar.gz
rails-13811eef778d45469c81e69aaf04fb76d39fae22.tar.bz2
rails-13811eef778d45469c81e69aaf04fb76d39fae22.zip
Merge pull request #2313 from ssoroka/master
Raise a rescuable exception, rather than responding with a head :not_acceptable (406)
Diffstat (limited to 'actionpack/test/controller/integration_test.rb')
-rw-r--r--actionpack/test/controller/integration_test.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 877b91b563..9f2dbda25f 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -405,6 +405,15 @@ class IntegrationProcessTest < ActionDispatch::IntegrationTest
end
end
+ def test_request_with_bad_format
+ with_test_route_set do
+ xhr :get, '/get.php'
+ assert_equal 406, status
+ assert_response 406
+ assert_response :not_acceptable
+ end
+ end
+
def test_get_with_query_string
with_test_route_set do
get '/get_with_params?foo=bar'