Skip to content

Commit 4f30df4

Browse files
committed
Make sure we unregister the mime type before registering
Also make sure we don't change the global state of our test suite.
1 parent a087cf4 commit 4f30df4

File tree

1 file changed

+22
-10
lines changed

1 file changed

+22
-10
lines changed

actionpack/test/dispatch/request/json_params_parsing_test.rb

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -151,19 +151,31 @@ def teardown
151151
end
152152

153153
test "parses json params after custom json mime type registered" do
154-
Mime::Type.register "application/json", :json, %w(application/vnd.api+json)
155-
assert_parses(
156-
{"user" => {"username" => "meinac"}, "username" => "meinac"},
157-
"{\"username\": \"meinac\"}", { 'CONTENT_TYPE' => 'application/json' }
158-
)
154+
begin
155+
Mime::Type.unregister :json
156+
Mime::Type.register "application/json", :json, %w(application/vnd.api+json)
157+
assert_parses(
158+
{"user" => {"username" => "meinac"}, "username" => "meinac"},
159+
"{\"username\": \"meinac\"}", { 'CONTENT_TYPE' => 'application/json' }
160+
)
161+
ensure
162+
Mime::Type.unregister :json
163+
Mime::Type.register "application/json", :json, %w( text/x-json application/jsonrequest )
164+
end
159165
end
160166

161167
test "parses json params after custom json mime type registered with synonym" do
162-
Mime::Type.register "application/json", :json, %w(application/vnd.api+json)
163-
assert_parses(
164-
{"user" => {"username" => "meinac"}, "username" => "meinac"},
165-
"{\"username\": \"meinac\"}", { 'CONTENT_TYPE' => 'application/vnd.api+json' }
166-
)
168+
begin
169+
Mime::Type.unregister :json
170+
Mime::Type.register "application/json", :json, %w(application/vnd.api+json)
171+
assert_parses(
172+
{"user" => {"username" => "meinac"}, "username" => "meinac"},
173+
"{\"username\": \"meinac\"}", { 'CONTENT_TYPE' => 'application/vnd.api+json' }
174+
)
175+
ensure
176+
Mime::Type.unregister :json
177+
Mime::Type.register "application/json", :json, %w( text/x-json application/jsonrequest )
178+
end
167179
end
168180

169181
private

0 commit comments

Comments
 (0)