aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2016-12-19 13:11:45 -0500
committerGitHub <noreply@github.com>2016-12-19 13:11:45 -0500
commita65ccb55f234b8f218be83eb5df57f3162cf7c55 (patch)
tree85754dca0d957c3950644ed50e90ac200a29909b /actionpack
parent1655b32dcea1f7e2ed80fa25296f4001477ecf14 (diff)
parent78c6c4b24810e505921d0bb3575c7a59e416c268 (diff)
downloadrails-a65ccb55f234b8f218be83eb5df57f3162cf7c55.tar.gz
rails-a65ccb55f234b8f218be83eb5df57f3162cf7c55.tar.bz2
rails-a65ccb55f234b8f218be83eb5df57f3162cf7c55.zip
Merge pull request #27146 from maclover7/jm-fix-27145
Do not clear HTTP_COOKIES header after request
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/test_case.rb2
-rw-r--r--actionpack/test/dispatch/cookies_test.rb10
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 c639178776..441667e556 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -515,8 +515,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"]