aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/test_case.rb
diff options
context:
space:
mode:
authorCarsten Wirth <carsten.wirth@blacklane.com>2014-12-16 19:30:52 +0100
committerCarsten Wirth <carsten.wirth@blacklane.com>2014-12-16 19:30:52 +0100
commit7ff31feb14b7e8ffe05bb591fffd2ac29383d5a4 (patch)
tree68c0771df4dbcd30978fecf9014a87803b33e8a3 /actionpack/lib/action_controller/test_case.rb
parent81e940c313b6924915ca77a0f3af66332c9f0b1f (diff)
downloadrails-7ff31feb14b7e8ffe05bb591fffd2ac29383d5a4.tar.gz
rails-7ff31feb14b7e8ffe05bb591fffd2ac29383d5a4.tar.bz2
rails-7ff31feb14b7e8ffe05bb591fffd2ac29383d5a4.zip
adding that assert_template with :layout will raise ArgumentError for unknown layout type
Diffstat (limited to 'actionpack/lib/action_controller/test_case.rb')
-rw-r--r--actionpack/lib/action_controller/test_case.rb2
1 files changed, 2 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