diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-25 16:45:55 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-25 16:45:55 -0800 |
| commit | 4d0dc53249aefc75a7d258e256b268198a7dd7a1 (patch) | |
| tree | c6f5c11186c177309e178409b7e1242adb4634e1 /actionpack/lib/action_controller/test_case.rb | |
| parent | 0a7ba19dcc2271ad6183041ca79e8766a0d2bc40 (diff) | |
| parent | 2d6c4ec731861225779f3106f038effb17a27b21 (diff) | |
| download | rails-4d0dc53249aefc75a7d258e256b268198a7dd7a1.tar.gz rails-4d0dc53249aefc75a7d258e256b268198a7dd7a1.tar.bz2 rails-4d0dc53249aefc75a7d258e256b268198a7dd7a1.zip | |
Merge pull request #8302 from roberto/assert_template_empty_string
assert_template("") will now fail no matter whether a template has been rendered or not.
Diffstat (limited to 'actionpack/lib/action_controller/test_case.rb')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 2 |
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 be8055955d..586dd3cdf9 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -94,7 +94,7 @@ module ActionController matches_template = case options when String - rendered.any? do |t, num| + !options.empty? && 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 |