From 1bcde3a771474403e5909bb3be47c8c77fb7eee0 Mon Sep 17 00:00:00 2001 From: Zuhao Wan Date: Thu, 5 Jun 2014 21:45:13 +0800 Subject: Mime::PNG is already defined. --- actionpack/test/controller/send_file_test.rb | 6 ------ actionpack/test/dispatch/mime_type_test.rb | 2 -- 2 files changed, 8 deletions(-) (limited to 'actionpack') 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| -- cgit v1.2.3