From 0cf16ddb88b4fa28c37e576d50d835b100c3f6a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 21 Oct 2009 15:55:47 -0200
Subject: Improve AbstractController layouts coverage.

---
 actionpack/test/abstract/layouts_test.rb | 53 ++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 12 deletions(-)

(limited to 'actionpack/test/abstract')

diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index 453d31826e..9c29696ad5 100644
--- a/actionpack/test/abstract/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -17,17 +17,6 @@ module AbstractControllerTests
         "layouts/omg.erb"                       => "OMGHI2U <%= yield %>",
         "layouts/with_false_layout.erb"         => "False Layout <%= yield %>"
       )]
-
-      def self.controller_path
-        @controller_path ||= self.name.sub(/Controller$/, '').underscore
-      end
-      
-      def controller_path() self.class.controller_path end
-      
-      def render_to_body(options)
-        options[:_layout] = _default_layout({})
-        super
-      end
     end
     
     class Blank < Base
@@ -44,6 +33,22 @@ module AbstractControllerTests
       def index
         render :_template => ActionView::TextTemplate.new("Hello string!")
       end
+
+      def overwrite_default
+        render :_template => ActionView::TextTemplate.new("Hello string!"), :layout => :default
+      end
+
+      def overwrite_false
+        render :_template => ActionView::TextTemplate.new("Hello string!"), :layout => false
+      end
+
+      def overwrite_string
+        render :_template => ActionView::TextTemplate.new("Hello string!"), :layout => "omg"
+      end
+
+      def overwrite_skip
+        render :text => "Hello text!"
+      end
     end
     
     class WithStringChild < WithString
@@ -153,7 +158,31 @@ module AbstractControllerTests
         controller.process(:index)
         assert_equal "With String Hello string!", controller.response_body
       end
-      
+
+      test "when layout is overwriten by :default in render, render default layout" do
+        controller = WithString.new
+        controller.process(:overwrite_default)
+        assert_equal "With String Hello string!", controller.response_body
+      end
+
+      test "when layout is overwriten by string in render, render new layout" do
+        controller = WithString.new
+        controller.process(:overwrite_string)
+        assert_equal "OMGHI2U Hello string!", controller.response_body
+      end
+
+      test "when layout is overwriten by false in render, render no layout" do
+        controller = WithString.new
+        controller.process(:overwrite_false)
+        assert_equal "Hello string!", controller.response_body
+      end
+
+      test "when text is rendered, render no layout" do
+        controller = WithString.new
+        controller.process(:overwrite_skip)
+        assert_equal "Hello text!", controller.response_body
+      end
+
       test "when layout is specified as a string, but the layout is missing, raise an exception" do
         assert_raises(ActionView::MissingTemplate) { WithMissingLayout.new.process(:index) }
       end
-- 
cgit v1.2.3