Merge pull request #15529 from zuhao/refactor_actionpack_mime_type_test

Make sure Mime::Type is not altered after tests.

2 files changed, 0 insertions, 8 deletions

diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index 2c833aa2e5..73ed33ce2d 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -33,17 +33,11 @@ class SendFileTest < ActionController::TestCase
   include TestFileUtils
 
   def setup
-    @mime_type_defined = defined? Mime::PNG
-    Mime::Type.register "image/png", :png unless @mime_type_defined
     @controller = SendFileController.new
     @request = ActionController::TestRequest.new
     @response = ActionController::TestResponse.new
   end
 
-  teardown do
-    Mime::Type.unregister :png unless @mime_type_defined
-  end
-
   def test_file_nostream
     @controller.options = { :stream => false }
     response = nil
diff --git a/actionpack/test/dispatch/mime_type_test.rb b/actionpack/test/dispatch/mime_type_test.rb
index 981cf2426e..d29cc8473e 100644
--- a/actionpack/test/dispatch/mime_type_test.rb
+++ b/actionpack/test/dispatch/mime_type_test.rb
@@ -1,8 +1,6 @@
 require 'abstract_unit'
 
 class MimeTypeTest < ActiveSupport::TestCase
-  Mime::Type.register "image/png", :png unless defined? Mime::PNG
-  Mime::Type.register "application/pdf", :pdf unless defined? Mime::PDF
 
   test "parse single" do
     Mime::LOOKUP.keys.each do |mime_type|