diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-06-27 22:48:56 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-27 22:48:56 -0300 |
| commit | 13a5cc33410bd26be8e7669259b60021fba7012a (patch) | |
| tree | f072d906ff27454a4e9d352e68386b75f42efc5c /actionpack/test | |
| parent | 7369178357a339b5af87ac04aa1256712ff2fdaa (diff) | |
| parent | 152ac626afac4c15310ec90a442f5953fe04ba6e (diff) | |
| download | rails-13a5cc33410bd26be8e7669259b60021fba7012a.tar.gz rails-13a5cc33410bd26be8e7669259b60021fba7012a.tar.bz2 rails-13a5cc33410bd26be8e7669259b60021fba7012a.zip | |
Merge pull request #25123 from bf4/remove_problematic_mime_test
Modifies mime-registration test not to interfere with real mime types
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/dispatch/request/json_params_parsing_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb index a07138b55e..6ab71ebc81 100644 --- a/actionpack/test/dispatch/request/json_params_parsing_test.rb +++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb @@ -155,7 +155,7 @@ class RootLessJSONParamsParsingTest < ActionDispatch::IntegrationTest test "parses json params after custom json mime type registered" do begin Mime::Type.unregister :json - Mime::Type.register "application/json", :json, %w(application/vnd.api+json) + Mime::Type.register "application/json", :json, %w(application/vnd.rails+json) assert_parses( {"user" => {"username" => "meinac"}, "username" => "meinac"}, "{\"username\": \"meinac\"}", { 'CONTENT_TYPE' => 'application/json' } @@ -169,10 +169,10 @@ class RootLessJSONParamsParsingTest < ActionDispatch::IntegrationTest test "parses json params after custom json mime type registered with synonym" do begin Mime::Type.unregister :json - Mime::Type.register "application/json", :json, %w(application/vnd.api+json) + Mime::Type.register "application/json", :json, %w(application/vnd.rails+json) assert_parses( {"user" => {"username" => "meinac"}, "username" => "meinac"}, - "{\"username\": \"meinac\"}", { 'CONTENT_TYPE' => 'application/vnd.api+json' } + "{\"username\": \"meinac\"}", { 'CONTENT_TYPE' => 'application/vnd.rails+json' } ) ensure Mime::Type.unregister :json |