Permalink
Browse files

Revert "Revert "update doc, assert_template also accepts false""

Reason: docrails policy is very strict about code. No matter how
innocent the change, if it is not documentation it needs to go
through a PR to rails/rails.

Plase see the warning box at the bottom of

    http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#contributing-to-the-rails-documentation

This reverts commit e1c5d24.
  • Loading branch information...
1 parent e1c5d24 commit 07ea37763d62e57d5709ab37da01b2848d12edd5 @fxn fxn committed Apr 21, 2014
Showing with 1 addition and 1 deletion.
  1. +1 −1 actionpack/lib/action_controller/test_case.rb
@@ -170,7 +170,7 @@ def assert_template(options = {}, message = nil)
"Expected no partials to be rendered"
end
else
- raise ArgumentError, "assert_template only accepts a String, Symbol, Hash, Regexp, or nil"
+ raise ArgumentError, "assert_template only accepts a String, Symbol, Hash, Regexp, nil or false"
end
end
end

0 comments on commit 07ea377

Please sign in to comment.