From 0893368fa5d64f2ed13ab7cdf8c39e8e24ab356e Mon Sep 17 00:00:00 2001 From: Erik Ostrom Date: Mon, 28 Sep 2009 10:34:04 -0700 Subject: [PATCH] Fixed that render :text with no layout returned nil. --- actionpack/lib/action_view/render/rendering.rb | 1 + actionpack/test/template/render_test.rb | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb index 8b0d4cc..0cab035 100644 --- a/actionpack/lib/action_view/render/rendering.rb +++ b/actionpack/lib/action_view/render/rendering.rb @@ -89,6 +89,7 @@ module ActionView def _render_text(text, layout, options) text = layout.render(self, options[:locals]) { text } if layout + text end # This is the API to render a ViewContext's template from a controller. diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb index 3c19290..2cb2ce4 100644 --- a/actionpack/test/template/render_test.rb +++ b/actionpack/test/template/render_test.rb @@ -223,6 +223,10 @@ module RenderTestCases end end + def test_render_text + assert_equal 'Hello world!', @view.render(:text => 'Hello world!') + end + def test_render_with_layout assert_equal %(\nHello world!\n), @view.render(:file => "test/hello_world.erb", :layout => "layouts/yield") -- 1.6.1.2