aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-05-17 09:08:45 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-05-17 10:50:43 -0700
commit165acf393fc16a89770829284ec3faa52844800f (patch)
treec8d280fcdccc3e50c87243548c18157091761add /actionpack
parent1b604c73f12ed11cf1f9bcc155f1fb89148bbe5c (diff)
downloadrails-165acf393fc16a89770829284ec3faa52844800f.tar.gz
rails-165acf393fc16a89770829284ec3faa52844800f.tar.bz2
rails-165acf393fc16a89770829284ec3faa52844800f.zip
MiniTest deprecated #assert_block in favor of calling #assert with a block
Diffstat (limited to 'actionpack')
-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 76d07891c9..98f70f2336 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -93,7 +93,7 @@ module ActionController
rendered = @templates
msg = message || sprintf("expecting <%s> but rendering with <%s>",
options.inspect, rendered.keys)
- assert_block(msg) do
+ assert(msg) do
if options
rendered.any? { |t,num| t.match(options) }
else