From 20723ca49873076d8fc8c2bf0729568373e31738 Mon Sep 17 00:00:00 2001 From: Roberto Soares Date: Fri, 23 Nov 2012 16:13:08 -0300 Subject: `assert_template` fails with empty string when a template has been rendered For instance, it prevents false positive in this case: file = nil get :index assert_template("#{file}") --- actionpack/lib/action_controller/test_case.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index be8055955d..fd3a261a72 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -94,10 +94,14 @@ module ActionController 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 + if options.empty? + rendered.blank? + else + 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 end when Regexp rendered.any? { |t,num| t.match(options) } -- cgit v1.2.3