diff options
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/controller/layout_test.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb index 93ef1560f6..9338bfa6f9 100644 --- a/actionpack/test/controller/layout_test.rb +++ b/actionpack/test/controller/layout_test.rb @@ -106,14 +106,13 @@ class ExemptFromLayoutTest < Test::Unit::TestCase assert @controller.send(:template_exempt_from_layout?, 'test.rdoc') end - # TODO: http://dev.rubyonrails.org/ticket/6742 - # The rhtml exemption is ignored. def test_rhtml_exempt_from_layout_status_should_prevent_layout_render ActionController::Base.exempt_from_layout :rhtml assert @controller.send(:template_exempt_from_layout?, 'test.rhtml') get :hello assert_equal 'hello.rhtml', @response.body + ActionController::Base.exempt_from_layout.delete(/\.rhtml$/) end end |