1 files changed, 20 insertions, 3 deletions
diff --git a/actionpack/test/new_base/render_action_test.rb b/actionpack/test/new_base/render_action_test.rb
index 348d70381b..626c7b3540 100644
--- a/actionpack/test/new_base/render_action_test.rb
+++ b/actionpack/test/new_base/render_action_test.rb
@@ -92,7 +92,7 @@ module RenderAction
     
     test "raises an exception when requesting a layout and none exist" do
       assert_raise(ArgumentError, /no default layout for RenderAction::BasicController in/) do 
-        get "/render_action/basic/hello_world_with_layout"
+        get "/render_action/basic/hello_world_with_layout", {}, "action_dispatch.show_exceptions" => false
       end
     end
   end
@@ -117,7 +117,9 @@ module RenderAction
     describe "rendering a normal template with full path with layout => 'greetings'"
     
     test "raises an exception when requesting a layout that does not exist" do
-      assert_raise(ActionView::MissingTemplate) { get "/render_action/basic/hello_world_with_custom_layout" }
+      assert_raise(ActionView::MissingTemplate) do
+        get "/render_action/basic/hello_world_with_custom_layout", {}, "action_dispatch.show_exceptions" => false
+      end
     end
   end
   
@@ -131,8 +133,10 @@ module RenderActionWithApplicationLayout
     # Set the view path to an application view structure with layouts
     self.view_paths = self.view_paths = [ActionView::Template::FixturePath.new(
       "render_action_with_application_layout/basic/hello_world.html.erb" => "Hello World!",
+      "render_action_with_application_layout/basic/hello.html.builder"   => "xml.p 'Omg'",
       "layouts/application.html.erb"                                     => "OHAI <%= yield %> KTHXBAI",
-      "layouts/greetings.html.erb"                                       => "Greetings <%= yield %> Bai"
+      "layouts/greetings.html.erb"                                       => "Greetings <%= yield %> Bai",
+      "layouts/builder.html.builder"                                     => "xml.html do\n  xml << yield\nend"
     )]
     
     def hello_world
@@ -154,6 +158,10 @@ module RenderActionWithApplicationLayout
     def hello_world_with_custom_layout
       render :action => "hello_world", :layout => "greetings"
     end
+    
+    def with_builder_and_layout
+      render :action => "hello", :layout => "builder"
+    end
   end
   
   class TestDefaultLayout < SimpleRouteCase
@@ -199,6 +207,15 @@ module RenderActionWithApplicationLayout
     assert_status 200
   end
   
+  class TestLayout < SimpleRouteCase
+    testing BasicController
+    
+    test "builder works with layouts" do
+      get :with_builder_and_layout
+      assert_response "<html>\n<p>Omg</p>\n</html>\n"
+    end
+  end
+  
 end
 
 module RenderActionWithControllerLayout