diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-30 00:21:51 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-30 00:21:51 -0300 |
| commit | 623f2fbb933994bb81187c18984ae51047d9b029 (patch) | |
| tree | 20c7bbd25939cf1ee5331f251c20ab6fed611bf8 /actionpack | |
| parent | d0d02bffe8dd12dcb2d113a60a6790d7a88e78be (diff) | |
| download | rails-623f2fbb933994bb81187c18984ae51047d9b029.tar.gz rails-623f2fbb933994bb81187c18984ae51047d9b029.tar.bz2 rails-623f2fbb933994bb81187c18984ae51047d9b029.zip | |
Whitespaces :scissors: [ci skip]
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 23 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 2 |
2 files changed, 14 insertions, 11 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 0849370db7..4306447272 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,20 +1,23 @@ ## Rails 4.0.0 (unreleased) ## -* `assert_template` no more passing with what ever string that matches. - - Given Im rendering an template `/layout/hello.html.erb`, assert_template was - passing with any string that matches. This behavior allowed false passing like: +* `assert_template` is no more passing with what ever string that matches + with the template name. - assert_template "layout" - assert_template "out/hello" + Before when we have a template `/layout/hello.html.erb`, `assert_template` + was passing with any string that matches. This behavior allowed false + positive like: - Now the passing possibilities are: + assert_template "layout" + assert_template "out/hello" - assert_template "layout/hello" - assert_template "hello" + Now it only passes with: - *Hugolnx* + assert_template "layout/hello" + assert_template "hello" + + Fixes #3849. + *Hugolnx* * `image_tag` will set the same width and height for image if numerical value passed to `size` option. diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 34974f5149..20c6e2bf53 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -91,7 +91,7 @@ module ActionController rendered = @templates msg = message || sprintf("expecting <%s> but rendering with <%s>", options.inspect, rendered.keys) - matches_template = + matches_template = case options when String rendered.any? do |t, num| |