github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

move the mime registration code to setup so that

Browse Source 
it could be cleaned up on teardown.

Currently the test code
test/controller/mime_responds_test.rb impacts
test/dispatch/mime_type_test.rb.

dispatch/mime_type_test.rb runs independently fine
but when run as part of rake breaks because of
new mime types registered in
controller/mime_responds_test.rb

Signed-off-by: José Valim <jose.valim@gmail.com>
This commit is contained in:
Neeraj Singh
2010-11-22 11:51:43 -05:00
committed by José Valim
parent 23ea19e20d
commit cdbbf6fd6b
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
actionpack/test/controller/mime_responds_test.rb
View File

@@ -97,7 +97,6 @@ class RespondToController < ActionController::Base
end
end
Mime::Type.register("text/x-mobile", :mobile)
def custom_constant_handling
respond_to do |type|
@@ -134,7 +133,6 @@ class RespondToController < ActionController::Base
end
end
Mime::Type.register_alias("text/html", :iphone)
def iphone_with_html_response_type
request.format = :iphone if request.env["HTTP_ACCEPT"] == "text/iphone"
@@ -200,10 +198,16 @@ class RespondToControllerTest < ActionController::TestCase
def setup
super
@request.host = "www.example.com"
Mime::Type.register_alias("text/html", :iphone)
Mime::Type.register("text/x-mobile", :mobile)
end
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'}
end
def test_html
@@ -616,6 +620,10 @@ 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'}
end
def test_using_resource
@@ -996,6 +1004,15 @@ class MimeControllerLayoutsTest < ActionController::TestCase
def setup
super
@request.host = "www.example.com"
Mime::Type.register_alias("text/html", :iphone)
end
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'}
end
def test_missing_layout_renders_properly