diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-01-14 13:57:44 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-01-14 13:57:44 +0000 |
| commit | 55efae272065c66f2f10ab786c300213e910465c (patch) | |
| tree | f059852987b09dba895022a4c6e59f2c60b793be /actionpack/test | |
| parent | a6e12c0c21159503cef99fa69be7a708a2d39ed9 (diff) | |
| download | rails-55efae272065c66f2f10ab786c300213e910465c.tar.gz rails-55efae272065c66f2f10ab786c300213e910465c.tar.bz2 rails-55efae272065c66f2f10ab786c300213e910465c.zip | |
Allow exempt_from_layout :rhtml. References #6742, closes #7026.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5927 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
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 |