aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorGaurish Sharma <contact@gaurishsharma.com>2014-04-21 18:33:19 +0530
committerGaurish Sharma <contact@gaurishsharma.com>2014-04-21 18:33:19 +0530
commite1c5d24369440857de1402d61c85d982b29d8019 (patch)
tree8e4aa4c215af6b2f88f8f96247d004c894a0b642 /actionpack/lib
parent28bd442034e0974d0a4d664076dafb8e9555816d (diff)
downloadrails-e1c5d24369440857de1402d61c85d982b29d8019.tar.gz
rails-e1c5d24369440857de1402d61c85d982b29d8019.tar.bz2
rails-e1c5d24369440857de1402d61c85d982b29d8019.zip
Revert "update doc, assert_template also accepts false"
This reverts commit 9b1c077c91f09b64b8105f31fdf5240cd12c2e16. my bad. `assert_template` only accepts a String, Symbol, Hash, Regexp or nil. `false`(layout: false) is provided as a Hash.
Diffstat (limited to 'actionpack/lib')
-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