diff options
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 37470b8713..b574a36430 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -72,26 +72,19 @@ module ActionController validate_request! case options - when NilClass, Regexp, String, Symbol + when NilClass, String, Symbol options = options.to_s if Symbol === options rendered = @templates msg = build_message(message, "expecting <?> but rendering with <?>", options, rendered.keys.join(', ')) - matches_template = - case options - when String - rendered.any? do |t, num| - options_splited = options.split(File::SEPARATOR) - t_splited = t.split(File::SEPARATOR) - t_splited.last(options_splited.size) == options_splited - end - when Regexp + assert_block(msg) do + if options rendered.any? { |t,num| t.match(options) } - when NilClass - rendered.blank? + else + @templates.blank? end - assert matches_template, msg + end when Hash if expected_layout = options[:layout] msg = build_message(message, |