diff options
| author | Roberto Soares <roberto.tech@gmail.com> | 2012-11-23 18:10:18 -0300 |
|---|---|---|
| committer | Roberto Soares <roberto.tech@gmail.com> | 2012-11-23 18:14:35 -0300 |
| commit | 2d6c4ec731861225779f3106f038effb17a27b21 (patch) | |
| tree | 9282faa66f30aff799ea75ce6d5c5293083aaa7f | |
| parent | 20723ca49873076d8fc8c2bf0729568373e31738 (diff) | |
| download | rails-2d6c4ec731861225779f3106f038effb17a27b21.tar.gz rails-2d6c4ec731861225779f3106f038effb17a27b21.tar.bz2 rails-2d6c4ec731861225779f3106f038effb17a27b21.zip | |
`assert_template` fails with empty string.
| -rw-r--r-- | actionpack/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 12 | ||||
| -rw-r--r-- | actionpack/test/controller/action_pack_assertions_test.rb | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 409725ae90..60af09083d 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,6 +1,6 @@ ## Rails 4.0.0 (unreleased) ## -* `assert_template` is no more passing with empty string when some template has been rendered. +* `assert_template` is no more passing with empty string. *Roberto Soares* diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index fd3a261a72..586dd3cdf9 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -94,14 +94,10 @@ module ActionController matches_template = case options when String - 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 + !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 end when Regexp rendered.any? { |t,num| t.match(options) } diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb index c653f7e756..5f559e5b00 100644 --- a/actionpack/test/controller/action_pack_assertions_test.rb +++ b/actionpack/test/controller/action_pack_assertions_test.rb @@ -454,6 +454,13 @@ class AssertTemplateTest < ActionController::TestCase end end + def test_with_empty_string_fails_when_no_template_rendered + get :nothing + assert_raise(ActiveSupport::TestCase::Assertion) do + assert_template "" + end + end + def test_passes_with_correct_string get :hello_world assert_template 'hello_world' |