diff options
| author | Zuhao Wan <wanzuhao@gmail.com> | 2014-06-05 21:45:13 +0800 |
|---|---|---|
| committer | Zuhao Wan <wanzuhao@gmail.com> | 2014-06-05 22:04:06 +0800 |
| commit | 1bcde3a771474403e5909bb3be47c8c77fb7eee0 (patch) | |
| tree | ba2dc46709c016dfc72406f661881d5fb109f53d | |
| parent | bb8b2141844872c94141091ffe3b45505fb3b4db (diff) | |
| download | rails-1bcde3a771474403e5909bb3be47c8c77fb7eee0.tar.gz rails-1bcde3a771474403e5909bb3be47c8c77fb7eee0.tar.bz2 rails-1bcde3a771474403e5909bb3be47c8c77fb7eee0.zip | |
Mime::PNG is already defined.
| -rw-r--r-- | actionpack/test/controller/send_file_test.rb | 6 | ||||
| -rw-r--r-- | actionpack/test/dispatch/mime_type_test.rb | 2 |
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| |