aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorRoberto Soares <roberto.tech@gmail.com>2012-11-25 23:39:08 -0300
committerRoberto Soares <roberto.tech@gmail.com>2012-11-25 23:39:08 -0300
commit3f2c011d319de8f188b98c286db3786990856de0 (patch)
tree6759f589a606d850e60a6b894f0e2ed1d3aead64 /actionpack/lib/action_controller
parent4d0dc53249aefc75a7d258e256b268198a7dd7a1 (diff)
downloadrails-3f2c011d319de8f188b98c286db3786990856de0.tar.gz
rails-3f2c011d319de8f188b98c286db3786990856de0.tar.bz2
rails-3f2c011d319de8f188b98c286db3786990856de0.zip
assert_template: validating option keys
Diffstat (limited to 'actionpack/lib/action_controller')
-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 586dd3cdf9..7b48870090 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -106,6 +106,8 @@ module ActionController
end
assert matches_template, msg
when Hash
+ options.assert_valid_keys(:layout, :partial, :locals, :count)
+
if options.key?(:layout)
expected_layout = options[:layout]
msg = message || sprintf("expecting layout <%s> but action rendered <%s>",