1 files changed, 62 insertions, 34 deletions
diff --git a/actionpack/test/new_base/render_layout_test.rb b/actionpack/test/new_base/render_layout_test.rb
index dc858b4f5c..f32c60d683 100644
--- a/actionpack/test/new_base/render_layout_test.rb
+++ b/actionpack/test/new_base/render_layout_test.rb
@@ -2,72 +2,100 @@ require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
 
 module ControllerLayouts
   class ImplicitController < ::ApplicationController
-    
     self.view_paths = [ActionView::Template::FixturePath.new(
       "layouts/application.html.erb" => "OMG <%= yield %> KTHXBAI",
       "layouts/override.html.erb"    => "Override! <%= yield %>",
       "basic.html.erb"               => "Hello world!",
       "controller_layouts/implicit/layout_false.html.erb" => "hai(layout_false.html.erb)"
     )]
-    
+
     def index
       render :template => "basic"
     end
-    
+
     def override
       render :template => "basic", :layout => "override"
     end
-    
+
     def layout_false
       render :layout => false
     end
-    
+
     def builder_override
-      
     end
   end
-  
-  class TestImplicitLayout < SimpleRouteCase
-    describe "rendering a normal template, but using the implicit layout"
-    
-    get "/controller_layouts/implicit/index"
-    assert_body   "OMG Hello world! KTHXBAI"
-    assert_status 200
-  end
-  
+
   class ImplicitNameController < ::ApplicationController
-    
     self.view_paths = [ActionView::Template::FixturePath.new(
       "layouts/controller_layouts/implicit_name.html.erb" => "OMGIMPLICIT <%= yield %> KTHXBAI",
       "basic.html.erb" => "Hello world!"
     )]
-        
+
     def index
       render :template => "basic"
     end
   end
-  
-  class TestImplicitNamedLayout < SimpleRouteCase
-    describe "rendering a normal template, but using an implicit NAMED layout"
-    
-    get "/controller_layouts/implicit_name/index"
-    assert_body   "OMGIMPLICIT Hello world! KTHXBAI"
-    assert_status 200
-  end
-  
-  class TestOverridingImplicitLayout < SimpleRouteCase
-    describe "overriding an implicit layout with render :layout option"
-    
-    get "/controller_layouts/implicit/override"
-    assert_body "Override! Hello world!"
+
+  class RenderLayoutTest < SimpleRouteCase
+    test "rendering a normal template, but using the implicit layout" do
+      get "/controller_layouts/implicit/index"
+
+      assert_body   "OMG Hello world! KTHXBAI"
+      assert_status 200
+    end
+
+    test "rendering a normal template, but using an implicit NAMED layout" do
+      get "/controller_layouts/implicit_name/index"
+
+      assert_body "OMGIMPLICIT Hello world! KTHXBAI"
+      assert_status 200
+    end
+
+    test "overriding an implicit layout with render :layout option" do
+      get "/controller_layouts/implicit/override"
+      assert_body "Override! Hello world!"
+    end
+
   end
-  
-  class TestLayoutOptions < SimpleRouteCase
+
+  class LayoutOptionsTest < SimpleRouteCase
     testing ControllerLayouts::ImplicitController
-    
+
     test "rendering with :layout => false leaves out the implicit layout" do
       get :layout_false
       assert_response "hai(layout_false.html.erb)"
     end
   end
+
+  class MismatchFormatController < ::ApplicationController
+    self.view_paths = [ActionView::Template::FixturePath.new(
+      "layouts/application.html.erb" => "<html><%= yield %></html>",
+      "controller_layouts/mismatch_format/index.js.rjs" => "page[:test].omg",
+      "controller_layouts/mismatch_format/implicit.rjs" => "page[:test].omg"      
+    )]
+
+    def explicit
+      render :layout => "application"
+    end
+  end
+
+  class MismatchFormatTest < SimpleRouteCase
+    testing ControllerLayouts::MismatchFormatController
+
+    test "if JS is selected, an HTML template is not also selected" do
+      get :index
+      assert_response "$(\"test\").omg();"
+    end
+
+    test "if JS is implicitly selected, an HTML template is not also selected" do
+      get :implicit
+      assert_response "$(\"test\").omg();"
+    end
+
+    test "if an HTML template is explicitly provides for a JS template, an error is raised" do
+      assert_raises ActionView::MissingTemplate do
+        get :explicit, {}, "action_dispatch.show_exceptions" => false
+      end
+    end
+  end
 end
 \ No newline at end of file