diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-05-17 13:17:17 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-05-17 13:17:17 -0700 |
| commit | 598fc201f9a023828d7e8777e24e0a66f01c7ff2 (patch) | |
| tree | 7bdd2f34a761ebfa97fd22e762cb3b5886c68335 | |
| parent | 0f5cc34ab58cda99d1401ecc82e1ebb873838dd7 (diff) | |
| download | rails-598fc201f9a023828d7e8777e24e0a66f01c7ff2.tar.gz rails-598fc201f9a023828d7e8777e24e0a66f01c7ff2.tar.bz2 rails-598fc201f9a023828d7e8777e24e0a66f01c7ff2.zip | |
Fix incorrect assert_block -> assert conversion. Assumed too much from the MiniTest deprecation message.
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 98f70f2336..028a8d3fba 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -93,13 +93,13 @@ module ActionController rendered = @templates msg = message || sprintf("expecting <%s> but rendering with <%s>", options.inspect, rendered.keys) - assert(msg) do + matches_template = if options rendered.any? { |t,num| t.match(options) } else @templates.blank? end - end + assert matches_template, msg when Hash if options.key?(:layout) expected_layout = options[:layout] |