Permalink
Browse files

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
  • Loading branch information...
2 parents 1081ae2 + 3f2c011 commit 02c30c64262fd9e1625bc7f3723729c4e62e610b @carlosantoniodasilva carlosantoniodasilva committed Nov 26, 2012
View
4 actionpack/CHANGELOG.md
@@ -1,6 +1,8 @@
## Rails 4.0.0 (unreleased) ##
-* `assert_template` is no more passing with empty string.
+* `assert_template`:
+ - is no more passing with empty string.
+ - is now validating option keys. It accepts: `:layout`, `:partial`, `:locals` and `:count`.
*Roberto Soares*
View
2 actionpack/lib/action_controller/test_case.rb
@@ -106,6 +106,8 @@ def assert_template(options = {}, message = nil)
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>",
View
6 actionpack/test/controller/action_pack_assertions_test.rb
@@ -430,6 +430,12 @@ def test_assert_response_failure_response_with_no_exception
class AssertTemplateTest < ActionController::TestCase
tests ActionPackAssertionsController
+ def test_with_invalid_hash_keys_raises_argument_error
+ assert_raise(ArgumentError) do
+ assert_template foo: "bar"
+ end
+ end
+
def test_with_partial
get :partial
assert_template :partial => '_partial'

0 comments on commit 02c30c6

Please sign in to comment.