aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-01-12 10:31:24 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-01-12 10:31:24 +0000
commit88e02f6e56a4c3cb521936c41b1bb1129b9147d3 (patch)
tree97c15960915789f2d10c5571f06e1589a2fa6fe3
parentc302cdfcc4e70d1adbc5fb4c89d361e446349800 (diff)
downloadrails-88e02f6e56a4c3cb521936c41b1bb1129b9147d3.tar.gz
rails-88e02f6e56a4c3cb521936c41b1bb1129b9147d3.tar.bz2
rails-88e02f6e56a4c3cb521936c41b1bb1129b9147d3.zip
Failing test for exempt_from_layout :rhtml. References #6742.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5909 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/test/controller/layout_test.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index 3e1d3d9644..93ef1560f6 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -75,6 +75,8 @@ end
class ExemptFromLayoutTest < Test::Unit::TestCase
def setup
@controller = LayoutTest.new
+ @request = ActionController::TestRequest.new
+ @response = ActionController::TestResponse.new
end
def test_rjs_exempt_from_layout
@@ -103,6 +105,16 @@ class ExemptFromLayoutTest < Test::Unit::TestCase
ActionController::Base.exempt_from_layout /\.rdoc/
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
+ end
end