diff options
Diffstat (limited to 'actionpack/test/new_base')
-rw-r--r-- | actionpack/test/new_base/render_text_test.rb | 28 | ||||
-rw-r--r-- | actionpack/test/new_base/test_helper.rb | 2 |
2 files changed, 27 insertions, 3 deletions
diff --git a/actionpack/test/new_base/render_text_test.rb b/actionpack/test/new_base/render_text_test.rb index 61ec6e05df..f91e6bd644 100644 --- a/actionpack/test/new_base/render_text_test.rb +++ b/actionpack/test/new_base/render_text_test.rb @@ -8,7 +8,7 @@ module HappyPath "layouts/greetings.html.erb" => "<%= yield %>, I wish thee well." )] - def render_hello_world_from_variable + def render_hello_world render :text => "hello david" end @@ -36,6 +36,14 @@ module HappyPath render :text => "hello world", :layout => true end + def render_text_with_layout_false + render :text => "hello world", :layout => false + end + + def render_text_with_layout_nil + render :text => "hello world", :layout => nil + end + def render_text_with_custom_layout render :text => "hello world", :layout => "greetings" end @@ -44,7 +52,7 @@ module HappyPath class TestSimpleTextRender < SimpleRouteCase describe "Rendering text from a action with default options renders the text without the layout" - get "/happy_path/render_text/render_hello_world_from_variable" + get "/happy_path/render_text/render_hello_world" assert_body "hello david" assert_status 200 end @@ -96,4 +104,20 @@ module HappyPath assert_body "hello world, I wish thee well." assert_status 200 end + + class TestTextRenderWithLayoutFalse < SimpleRouteCase + describe "Rendering text with :layout => false" + + get "/happy_path/render_text/render_text_with_layout_false" + assert_body "hello world" + assert_status 200 + end + + class TestTextRenderWithLayoutNil < SimpleRouteCase + describe "Rendering text with :layout => nil" + + get "/happy_path/render_text/render_text_with_layout_nil" + assert_body "hello world" + assert_status 200 + end end
\ No newline at end of file diff --git a/actionpack/test/new_base/test_helper.rb b/actionpack/test/new_base/test_helper.rb index affb52a432..a66fc321e6 100644 --- a/actionpack/test/new_base/test_helper.rb +++ b/actionpack/test/new_base/test_helper.rb @@ -32,8 +32,8 @@ module ActionController include ActionController::HideActions include ActionController::UrlFor - include ActionController::Renderer include ActionController::Layouts + include ActionController::Renderer def self.inherited(klass) @subclasses ||= [] |