diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-01 19:30:08 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-01 23:58:05 -0300 |
| commit | 2bad605873b5b720d77ae6388a995827ab7fe705 (patch) | |
| tree | f751fa5d7c4c8edd6605126ea24cd6db593e4a3e /actionpack/lib/action_view | |
| parent | 3b5bc8d71ba97ddc254ab3dc81893c82e81a783b (diff) | |
| download | rails-2bad605873b5b720d77ae6388a995827ab7fe705.tar.gz rails-2bad605873b5b720d77ae6388a995827ab7fe705.tar.bz2 rails-2bad605873b5b720d77ae6388a995827ab7fe705.zip | |
Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variables
prefix TemplateAssertions ivars.
Closes #7459
Conflicts:
actionpack/lib/action_controller/test_case.rb
actionpack/lib/action_view/test_case.rb
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/test_case.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb index 658a503f7f..dfaa1d88e4 100644 --- a/actionpack/lib/action_view/test_case.rb +++ b/actionpack/lib/action_view/test_case.rb @@ -193,16 +193,16 @@ module ActionView @_result @_routes @controller - @layouts + @_layouts @locals @method_name @output_buffer - @partials + @_partials @passed @rendered @request @routes - @templates + @_templates @options @test_passed @view |