aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2014-04-21 08:25:50 -0500
committerXavier Noria <fxn@hashref.com>2014-04-21 08:25:50 -0500
commit957881a45b68a28e6118db28bd465fedba51f593 (patch)
tree8e4aa4c215af6b2f88f8f96247d004c894a0b642
parent07ea37763d62e57d5709ab37da01b2848d12edd5 (diff)
downloadrails-957881a45b68a28e6118db28bd465fedba51f593.tar.gz
rails-957881a45b68a28e6118db28bd465fedba51f593.tar.bz2
rails-957881a45b68a28e6118db28bd465fedba51f593.zip
Revert "Revert "Revert "update doc, assert_template also accepts false"""
Revert Festival! I reverted a reverted commit, undo. This reverts commit 07ea37763d62e57d5709ab37da01b2848d12edd5.
-rw-r--r--actionpack/lib/action_controller/test_case.rb2
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 a79c139b4d..2962ce47f9 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, nil or false"
+ raise ArgumentError, "assert_template only accepts a String, Symbol, Hash, Regexp, or nil"
end
end
end