adding that assert_template with :layout will raise ArgumentError for unknown layout type

2 files changed, 9 insertions, 0 deletions

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index cd92962dc3..b9172f8fa3 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -145,6 +145,8 @@ module ActionController
             assert(@_layouts.keys.any? {|l| l =~ expected_layout }, msg)
           when nil, false
             assert(@_layouts.empty?, msg)
+          else
+            raise ArgumentError, "assert_template only accepts a String, Symbol, Regexp, nil or false for :layout"
           end
         end
 
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index f2a4503f13..d0dfbfbc74 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -575,6 +575,13 @@ class AssertTemplateTest < ActionController::TestCase
     end
   end
 
+  def test_fails_expecting_not_known_layout
+    get :render_with_layout
+    assert_raise(ArgumentError) do
+      assert_template :layout => 1
+    end
+  end
+
   def test_passes_with_correct_layout
     get :render_with_layout
     assert_template :layout => "layouts/standard"