diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-30 23:51:10 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-30 23:52:51 -0200 |
| commit | 6b7cd20ab39b16cb5111ecca71ffea4fd95a0066 (patch) | |
| tree | b8e8ea36f1fe78e01c95caf68d541f273922e243 /actionpack/lib/action_view/test_case.rb | |
| parent | 37c60c91f3224baea579fca1df7a580d85ec143f (diff) | |
| download | rails-6b7cd20ab39b16cb5111ecca71ffea4fd95a0066.tar.gz rails-6b7cd20ab39b16cb5111ecca71ffea4fd95a0066.tar.bz2 rails-6b7cd20ab39b16cb5111ecca71ffea4fd95a0066.zip | |
Revert "Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variables"
This reverts commit 2bad605873b5b720d77ae6388a995827ab7fe705.
Conflicts:
actionpack/CHANGELOG.md
Reason: This added a regression related with shoulda-matchers, since it
is expecting the instance variable @layouts
See https://github.com/thoughtbot/shoulda-matchers/blob/9e1188eea68c47d9a56ce6280e45027da6187ab1/lib/shoulda/matchers/action_controller/render_with_layout_matcher.rb#L74
This will introduce back #7459 but this stable release will be backward compatible.
Related with #8068.
Diffstat (limited to 'actionpack/lib/action_view/test_case.rb')
| -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 dfaa1d88e4..658a503f7f 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 |