diff options
| author | Xavier Noria <fxn@hashref.com> | 2014-04-21 08:21:12 -0500 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2014-04-21 08:22:27 -0500 |
| commit | 07ea37763d62e57d5709ab37da01b2848d12edd5 (patch) | |
| tree | 3d4584d858917842b08baf72fca61219a4fb767a | |
| parent | e1c5d24369440857de1402d61c85d982b29d8019 (diff) | |
| download | rails-07ea37763d62e57d5709ab37da01b2848d12edd5.tar.gz rails-07ea37763d62e57d5709ab37da01b2848d12edd5.tar.bz2 rails-07ea37763d62e57d5709ab37da01b2848d12edd5.zip | |
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 e1c5d24369440857de1402d61c85d982b29d8019.
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 2962ce47f9..a79c139b4d 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -170,7 +170,7 @@ module ActionController "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 |