diff options
| author | Yehuda Katz <wycats@gmail.com> | 2013-05-11 22:49:58 -0700 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2013-05-11 22:49:58 -0700 |
| commit | a395c22fd3f55040c041a330c14b3676bfee29fc (patch) | |
| tree | a0d5b9d0173eff0adbd6854e7c6e0ad0c3f6c824 /actionpack/test | |
| parent | 98ade30e421e2c9e405060bba87ecbd092f11698 (diff) | |
| parent | ce4456fde6f45f1abd020cbdeb520d401299e01f (diff) | |
| download | rails-a395c22fd3f55040c041a330c14b3676bfee29fc.tar.gz rails-a395c22fd3f55040c041a330c14b3676bfee29fc.tar.bz2 rails-a395c22fd3f55040c041a330c14b3676bfee29fc.zip | |
Merge pull request #10576 from sferik/remove_multi_json_dependency
Replace multi_json with json
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/dispatch/request/json_params_parsing_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb index 8d0a845f15..b62ed6a8b2 100644 --- a/actionpack/test/dispatch/request/json_params_parsing_test.rb +++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb @@ -62,7 +62,7 @@ class JsonParamsParsingTest < ActionDispatch::IntegrationTest $stderr = StringIO.new # suppress the log json = "[\"person]\": {\"name\": \"David\"}}" exception = assert_raise(ActionDispatch::ParamsParser::ParseError) { post "/parse", json, {'CONTENT_TYPE' => 'application/json', 'action_dispatch.show_exceptions' => false} } - assert_equal MultiJson::DecodeError, exception.original_exception.class + assert_equal JSON::ParserError, exception.original_exception.class assert_equal exception.original_exception.message, exception.message ensure $stderr = STDERR |