diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-29 20:00:10 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-30 00:18:57 -0300 |
| commit | 7d17cd2cbfc086f5aa9dd636e1207eb130150428 (patch) | |
| tree | 5fa391252294de8ab1eecdbe18f3afa1a9d813e0 /actionpack/CHANGELOG.md | |
| parent | c2a7084a2df375e2a608767c6079a8d82a783620 (diff) | |
| download | rails-7d17cd2cbfc086f5aa9dd636e1207eb130150428.tar.gz rails-7d17cd2cbfc086f5aa9dd636e1207eb130150428.tar.bz2 rails-7d17cd2cbfc086f5aa9dd636e1207eb130150428.zip | |
Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased
REBASED: fixing assert_template bug when template matches expected, but not ends with
Conflicts:
actionpack/CHANGELOG.md
actionpack/lib/action_controller/test_case.rb
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 09e9188f6f..416a69d562 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,24 @@ ## Rails 3.2.9 (unreleased) ## +* `assert_template` is no more passing with what ever string that matches + with the template name. + + 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: + + assert_template "layout" + assert_template "out/hello" + + Now it only passes with: + + assert_template "layout/hello" + assert_template "hello" + + Fixes #3849. + + *Hugolnx* + * Fixed a bug with shorthand routes scoped with the `:module` option not adding the module to the controller as described in issue #6497. This should now work properly: |