diff options
author | Jeremy Kemper <jeremykemper@gmail.com> | 2014-09-13 18:02:45 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremykemper@gmail.com> | 2014-09-13 18:02:45 -0700 |
commit | e47b3e15edc8e4688611427768c51b9269d01293 (patch) | |
tree | fede8d37c0da2d5b61a017abe97607bda297b728 /actionpack/test | |
parent | 4a7d889ff47527f3b3b7a96ee3511e181d9a7122 (diff) | |
parent | 75eaefcc2f7c7526be389702c4802a73d4d934e9 (diff) | |
download | rails-e47b3e15edc8e4688611427768c51b9269d01293.tar.gz rails-e47b3e15edc8e4688611427768c51b9269d01293.tar.bz2 rails-e47b3e15edc8e4688611427768c51b9269d01293.zip |
Merge pull request #16912 from yuki24/rescue-rack-parameter-type-error
Rescue `Rack::Utils::ParameterTypeError` instead of `TypeError`
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/dispatch/request_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb index 00b80c7357..a58306ea0a 100644 --- a/actionpack/test/dispatch/request_test.rb +++ b/actionpack/test/dispatch/request_test.rb @@ -915,7 +915,7 @@ class RequestParameters < BaseRequestTest 2.times do assert_raises(ActionController::BadRequest) do - # rack will raise a TypeError when parsing this query string + # rack will raise a Rack::Utils::ParameterTypeError when parsing this query string request.parameters end end @@ -941,7 +941,7 @@ class RequestParameters < BaseRequestTest ) assert_raises(ActionController::BadRequest) do - # rack will raise a TypeError when parsing this query string + # rack will raise a Rack::Utils::ParameterTypeError when parsing this query string request.parameters end end @@ -950,7 +950,7 @@ class RequestParameters < BaseRequestTest request = stub_request("QUERY_STRING" => "x[y]=1&x[y][][w]=2") e = assert_raises(ActionController::BadRequest) do - # rack will raise a TypeError when parsing this query string + # rack will raise a Rack::Utils::ParameterTypeError when parsing this query string request.parameters end |