diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-06 12:45:03 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-06 16:48:29 -0300 |
| commit | 92d761237ea9372fefd2c4e514f7f8290eb28d1e (patch) | |
| tree | c3fe5e88c7f684fc51e69d969abb0be8e418953a /actionpack/CHANGELOG.md | |
| parent | de360ac565b5fea40f154f03fde3f74f0b4b31a8 (diff) | |
| download | rails-92d761237ea9372fefd2c4e514f7f8290eb28d1e.tar.gz rails-92d761237ea9372fefd2c4e514f7f8290eb28d1e.tar.bz2 rails-92d761237ea9372fefd2c4e514f7f8290eb28d1e.zip | |
Merge pull request #7848 from senny/3415_assert_template_has_nil_variable
can't pass :locals to #assert_template without a view test case (#3415)
Conflicts:
actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index fd54315d96..ebd92ed0c9 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,10 @@ ## Rails 3.2.9 (unreleased) ## +* Warn when the `:locals` option is passed to `assert_template` outside of a view test case + Fix #3415 + + *Yves Senn* + * Rename internal variables on ActionController::TemplateAssertions to prevent naming collisions. @partials, @templates and @layouts are now prefixed with an underscore. Fix #7459 |