diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-20 16:52:56 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-20 16:54:21 -0700 |
| commit | c4a6109286909c394e8c5bfc471a1eb9de245d2b (patch) | |
| tree | c6801a160133bdee57c19b64625964dba266c943 /actionpack/test/controller/mime_responds_test.rb | |
| parent | 8e7a87d299483fce6af3be89e50deae43055a96f (diff) | |
| download | rails-c4a6109286909c394e8c5bfc471a1eb9de245d2b.tar.gz rails-c4a6109286909c394e8c5bfc471a1eb9de245d2b.tar.bz2 rails-c4a6109286909c394e8c5bfc471a1eb9de245d2b.zip | |
Got controller/mime_responds_test.rb running on the new base
Diffstat (limited to 'actionpack/test/controller/mime_responds_test.rb')
| -rw-r--r-- | actionpack/test/controller/mime_responds_test.rb | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb index 3b8babb84c..56b49251c6 100644 --- a/actionpack/test/controller/mime_responds_test.rb +++ b/actionpack/test/controller/mime_responds_test.rb @@ -375,9 +375,11 @@ class MimeControllerTest < ActionController::TestCase end def test_rjs_type_skips_layout - @request.accept = "text/javascript" - get :all_types_with_layout - assert_equal 'RJS for all_types_with_layout', @response.body + pending(:new_base) do + @request.accept = "text/javascript" + get :all_types_with_layout + assert_equal 'RJS for all_types_with_layout', @response.body + end end def test_html_type_with_layout @@ -510,7 +512,7 @@ class SuperPostController < PostController end end -if ENV["new_base"] +if defined?(ActionController::Http) PostController._write_layout_method SuperPostController._write_layout_method end @@ -532,14 +534,16 @@ class MimeControllerLayoutsTest < ActionController::TestCase assert_equal 'Hello iPhone', @response.body end - def test_format_with_inherited_layouts - @controller = SuperPostController.new + for_tag(:old_base) do + def test_format_with_inherited_layouts + @controller = SuperPostController.new - get :index - assert_equal 'Super Firefox', @response.body + get :index + assert_equal 'Super Firefox', @response.body - @request.accept = "text/iphone" - get :index - assert_equal '<html><div id="super_iphone">Super iPhone</div></html>', @response.body + @request.accept = "text/iphone" + get :index + assert_equal '<html><div id="super_iphone">Super iPhone</div></html>', @response.body + end end end |