aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/mime_responds_test.rb
diff options
context:
space:
mode:
authorNeeraj Singh <neerajdotname@gmail.com>2010-11-23 23:49:15 +0800
committerJosé Valim <jose.valim@gmail.com>2010-11-25 04:38:50 +0800
commitb52a6ba16914d29785e751011e91d7bb91a2356d (patch)
treeb712de778ba32a6cf290ae2b66ee4190842f846a /actionpack/test/controller/mime_responds_test.rb
parente8708836252852d8bae87c80472b865812fa9776 (diff)
downloadrails-b52a6ba16914d29785e751011e91d7bb91a2356d.tar.gz
rails-b52a6ba16914d29785e751011e91d7bb91a2356d.tar.bz2
rails-b52a6ba16914d29785e751011e91d7bb91a2356d.zip
clean up test by using unregister method
Diffstat (limited to 'actionpack/test/controller/mime_responds_test.rb')
-rw-r--r--actionpack/test/controller/mime_responds_test.rb18
1 files changed, 6 insertions, 12 deletions
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index 8e7d8056a0..8315f90fee 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -201,10 +201,8 @@ class RespondToControllerTest < ActionController::TestCase
def teardown
super
- Mime.module_eval { remove_const :IPHONE if const_defined?(:IPHONE) }
- Mime.module_eval { remove_const :MOBILE if const_defined?(:MOBILE) }
- Mime::LOOKUP.reject!{|key,_| key == 'text/x-mobile'}
- Mime::LOOKUP.reject!{|key,_| key == 'text/iphone'}
+ Mime::Type.unregister('text/x-mobile', :iphone)
+ Mime::Type.unregister('text/iphone', :mobile)
end
def test_html
@@ -617,10 +615,8 @@ class RespondWithControllerTest < ActionController::TestCase
def teardown
super
- Mime.module_eval { remove_const :IPHONE if const_defined?(:IPHONE) }
- Mime.module_eval { remove_const :MOBILE if const_defined?(:MOBILE) }
- Mime::LOOKUP.reject!{|key,_| key == 'text/x-mobile'}
- Mime::LOOKUP.reject!{|key,_| key == 'text/iphone'}
+ Mime::Type.unregister('text/x-mobile', :iphone)
+ Mime::Type.unregister('text/iphone', :mobile)
end
def test_using_resource
@@ -1006,10 +1002,8 @@ class MimeControllerLayoutsTest < ActionController::TestCase
def teardown
super
- Mime.module_eval { remove_const :IPHONE if const_defined?(:IPHONE) }
- Mime.module_eval { remove_const :MOBILE if const_defined?(:MOBILE) }
- Mime::LOOKUP.reject!{|key,_| key == 'text/x-mobile'}
- Mime::LOOKUP.reject!{|key,_| key == 'text/iphone'}
+ Mime::Type.unregister('text/x-mobile', :iphone)
+ Mime::Type.unregister('text/iphone', :mobile)
end
def test_missing_layout_renders_properly