Ensure @content_for_* is checked before yielding to block in render :layout [#8994 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>

3 files changed, 15 insertions, 0 deletions

diff --git a/actionpack/test/fixtures/layouts/_column.html.erb b/actionpack/test/fixtures/layouts/_column.html.erb
new file mode 100644
index 0000000000..96db002b8a
--- /dev/null
+++ b/actionpack/test/fixtures/layouts/_column.html.erb
@@ -0,0 +1,2 @@
+<div id="column"><%= yield :column %></div>
+<div id="content"><%= yield %></div>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/nested_layout.erb b/actionpack/test/fixtures/test/nested_layout.erb
new file mode 100644
index 0000000000..7b6dcbb6c7
--- /dev/null
+++ b/actionpack/test/fixtures/test/nested_layout.erb
@@ -0,0 +1,3 @@
+<% content_for :title, "title" -%>
+<% content_for :column do -%>column<% end -%>
+<% render :layout => 'layouts/column' do -%>content<% end -%>
\ No newline at end of file
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