From 6b7cd20ab39b16cb5111ecca71ffea4fd95a0066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Tue, 30 Oct 2012 23:51:10 -0200
Subject: 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.
---
 actionpack/lib/action_view/test_case.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack/lib/action_view/test_case.rb')

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
-- 
cgit v1.2.3