From 07ea37763d62e57d5709ab37da01b2848d12edd5 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Mon, 21 Apr 2014 08:21:12 -0500 Subject: 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. --- actionpack/lib/action_controller/test_case.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack') 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 -- cgit v1.2.3