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 19:30:08 -0700 |
| commit | f934aecf61cd2c5df8a598fbddc83516f92d96c0 (patch) | |
| tree | 092097d0cc26f8e3e2ffa2e5cf17b051911220cc /actionpack/lib/action_view | |
| parent | 325748d6b55e9d2f758d3f98da3218d351427643 (diff) | |
| parent | bb0f4a1234e88fc4d100ad850f1efc18dd89cfc5 (diff) | |
| download | rails-f934aecf61cd2c5df8a598fbddc83516f92d96c0.tar.gz rails-f934aecf61cd2c5df8a598fbddc83516f92d96c0.tar.bz2 rails-f934aecf61cd2c5df8a598fbddc83516f92d96c0.zip | |
Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variables
prefix TemplateAssertions ivars.
Closes #7459
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 b7fd6ec7e1..5434b3421e 100644 --- a/actionpack/lib/action_view/test_case.rb +++ b/actionpack/lib/action_view/test_case.rb @@ -196,17 +196,17 @@ module ActionView :@_result, :@_routes, :@controller, - :@layouts, + :@_layouts, :@locals, :@method_name, :@output_buffer, - :@partials, + :@_partials, :@passed, :@rendered, :@request, :@routes, :@tagged_logger, - :@templates, + :@_templates, :@options, :@test_passed, :@view, |