From 78c6c4b24810e505921d0bb3575c7a59e416c268 Mon Sep 17 00:00:00 2001
From: Jon Moss <me@jonathanmoss.me>
Date: Tue, 22 Nov 2016 16:25:44 -0500
Subject: Do not clear HTTP_COOKIES header after request

---
 actionpack/lib/action_controller/test_case.rb |  2 --
 actionpack/test/dispatch/cookies_test.rb      | 10 ++++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 85f2501d42..15f3173e06 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -514,8 +514,6 @@ module ActionController
           @request = @controller.request
           @response = @controller.response
 
-          @request.delete_header "HTTP_COOKIE"
-
           if @request.have_cookie_jar?
             unless @request.cookie_jar.committed?
               @request.cookie_jar.write(@response)
diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
index af3036d448..bf146a5c39 100644
--- a/actionpack/test/dispatch/cookies_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -272,6 +272,10 @@ class CookiesTest < ActionController::TestCase
     def noop
       head :ok
     end
+
+    def encrypted_cookie
+      cookies.encrypted["foo"]
+    end
   end
 
   tests TestController
@@ -1189,6 +1193,12 @@ class CookiesTest < ActionController::TestCase
     assert_equal "david", cookies[:user_name]
   end
 
+  def test_cookies_are_not_cleared
+    cookies.encrypted["foo"] = "bar"
+    get :noop
+    assert_equal "bar", @controller.encrypted_cookie
+  end
+
   private
     def assert_cookie_header(expected)
       header = @response.headers["Set-Cookie"]
-- 
cgit v1.2.3