diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-26 02:41:45 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-26 02:41:45 -0800 |
| commit | 02c30c64262fd9e1625bc7f3723729c4e62e610b (patch) | |
| tree | 2f45d92861b7b8c218055dde84b84a851d9fdadc /actionpack/lib/action_controller | |
| parent | 1081ae20fb1d23b27e21e3e9f1de62253e34804f (diff) | |
| parent | 3f2c011d319de8f188b98c286db3786990856de0 (diff) | |
| download | rails-02c30c64262fd9e1625bc7f3723729c4e62e610b.tar.gz rails-02c30c64262fd9e1625bc7f3723729c4e62e610b.tar.bz2 rails-02c30c64262fd9e1625bc7f3723729c4e62e610b.zip | |
Merge pull request #8316 from roberto/assert_template_validate_options
assert_template: validating option keys
It only handles the keys locals, partial, layout and count.
assert_template(foo: "bar") # raises ArgumentError
assert_template(leiaute: "test") # raises ArgumentError
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 2 |
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>", |