From 35cc73e79d352430c140964570a0a6df727d1097 Mon Sep 17 00:00:00 2001
From: Zuhao Wan <wanzuhao@gmail.com>
Date: Wed, 28 May 2014 22:54:12 +0800
Subject: Unregister Mime::Type in teardown.

---
 actionpack/test/controller/send_file_test.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index aee139b95e..2c833aa2e5 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -32,14 +32,18 @@ end
 class SendFileTest < ActionController::TestCase
   include TestFileUtils
 
-  Mime::Type.register "image/png", :png unless defined? Mime::PNG
-
   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
-- 
cgit v1.2.3