diff options
author | Ryan Bates <ryan@railscasts.com> | 2008-10-28 17:31:33 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2008-10-28 17:31:33 -0500 |
commit | 4ad5aa9a39a83863331a7665407dac475855765b (patch) | |
tree | f5002e97e755b3bac25988562ed79ebc72c92f68 /actionpack/test/template | |
parent | 4684e76aefca2c49d3421e7184a1d568e2cc0dac (diff) | |
download | rails-4ad5aa9a39a83863331a7665407dac475855765b.tar.gz rails-4ad5aa9a39a83863331a7665407dac475855765b.tar.bz2 rails-4ad5aa9a39a83863331a7665407dac475855765b.zip |
Ensure @content_for_* is checked before yielding to block in render :layout [#8994 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'actionpack/test/template')
-rw-r--r-- | actionpack/test/template/render_test.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb index 7e4fff3da6..da8c782880 100644 --- a/actionpack/test/template/render_test.rb +++ b/actionpack/test/template/render_test.rb @@ -162,4 +162,14 @@ class ViewRenderTest < Test::Unit::TestCase ActionView::Template.register_template_handler :foo, CustomHandler assert_equal 'source: "Hello, <%= name %>!"', @view.render(:inline => "Hello, <%= name %>!", :locals => { :name => "Josh" }, :type => :foo) end + + def test_render_with_layout + assert_equal %(<title></title>\nHello world!\n), + @view.render(:file => "test/hello_world.erb", :layout => "layouts/yield") + end + + def test_render_with_nested_layout + assert_equal %(<title>title</title>\n<div id="column">column</div>\n<div id="content">content</div>\n), + @view.render(:file => "test/nested_layout.erb", :layout => "layouts/yield") + end end |