From c3e8d15e8babd8c27aa04ced8cde40fdc124416a Mon Sep 17 00:00:00 2001
From: Calvin Correli <calvin@correli.me>
Date: Wed, 12 Nov 2014 13:06:18 +0100
Subject: Fix for assigns(:..) resetting template assertions

When calling assigns(:...) or cookies(:...), template assertions would be reset, which they obviously shouldn't be.
---
 actionpack/test/dispatch/template_assertions_test.rb | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'actionpack/test/dispatch/template_assertions_test.rb')

diff --git a/actionpack/test/dispatch/template_assertions_test.rb b/actionpack/test/dispatch/template_assertions_test.rb
index 3c393f937b..7278754b49 100644
--- a/actionpack/test/dispatch/template_assertions_test.rb
+++ b/actionpack/test/dispatch/template_assertions_test.rb
@@ -10,7 +10,7 @@ class AssertTemplateController < ActionController::Base
   end
 
   def render_with_layout
-    @variable_for_layout = nil
+    @variable_for_layout = 'hello'
     render 'test/hello_world', layout: "layouts/standard"
   end
 
@@ -95,4 +95,16 @@ class AssertTemplateControllerTest < ActionDispatch::IntegrationTest
       session.assert_template file: nil
     end
   end
+
+  def test_assigns_do_not_reset_template_assertion
+    get '/assert_template/render_with_layout'
+    assert_equal 'hello', assigns(:variable_for_layout)
+    assert_template layout: 'layouts/standard'
+  end
+
+  def test_cookies_do_not_reset_template_assertion
+    get '/assert_template/render_with_layout'
+    cookies
+    assert_template layout: 'layouts/standard'
+  end
 end
-- 
cgit v1.2.3