Make sure we unregister the mime type before registering

Also make sure we don't change the global state of our test suite.
rails · Feb 22, 2016 · 5cb6385 · 5cb6385
1 parent 023a47c
commit 5cb6385
Showing 1 changed file with 22 additions and 10 deletions.
diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb
@@ -151,19 +151,31 @@ def teardown
   end
 
   test "parses json params after custom json mime type registered" do
-    Mime::Type.register "application/json", :json, %w(application/vnd.api+json)
-    assert_parses(
-      {"user" => {"username" => "meinac"}, "username" => "meinac"},
-      "{\"username\": \"meinac\"}", { 'CONTENT_TYPE' => 'application/json' }
-    )
+    begin
+      Mime::Type.unregister :json
+      Mime::Type.register "application/json", :json, %w(application/vnd.api+json)
+      assert_parses(
+        {"user" => {"username" => "meinac"}, "username" => "meinac"},
+        "{\"username\": \"meinac\"}", { 'CONTENT_TYPE' => 'application/json' }
+      )
+    ensure
+      Mime::Type.unregister :json
+      Mime::Type.register "application/json", :json, %w( text/x-json application/jsonrequest )
+    end
   end
 
   test "parses json params after custom json mime type registered with synonym" do
-    Mime::Type.register "application/json", :json, %w(application/vnd.api+json)
-    assert_parses(
-      {"user" => {"username" => "meinac"}, "username" => "meinac"},
-      "{\"username\": \"meinac\"}", { 'CONTENT_TYPE' => 'application/vnd.api+json' }
-    )
+    begin
+      Mime::Type.unregister :json
+      Mime::Type.register "application/json", :json, %w(application/vnd.api+json)
+      assert_parses(
+        {"user" => {"username" => "meinac"}, "username" => "meinac"},
+        "{\"username\": \"meinac\"}", { 'CONTENT_TYPE' => 'application/vnd.api+json' }
+      )
+    ensure
+      Mime::Type.unregister :json
+      Mime::Type.register "application/json", :json, %w( text/x-json application/jsonrequest )
+    end
   end
 
   private