kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #35649 from andrehjr/fix-override-of-cookies-controller-specs

Browse source 
Don't override @set_cookies on CookieJar#update_cookies_from_jar'
This commit is contained in:
Rafael França 2019-03-19 21:19:45 -04:00 committed by GitHub
commit 7c6343078a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/lib/action_dispatch/middleware/cookies.rb
View file

@ -338,7 +338,7 @@ module ActionDispatch
def update_cookies_from_jar def update_cookies_from_jar
request_jar = @request.cookie_jar.instance_variable_get(:@cookies) request_jar = @request.cookie_jar.instance_variable_get(:@cookies)
set_cookies = request_jar.reject { |k, _| @delete_cookies.key?(k) } set_cookies = request_jar.reject { |k, _| @delete_cookies.key?(k) || @set_cookies.key?(k) }
@cookies.update set_cookies if set_cookies @cookies.update set_cookies if set_cookies
end end

13
actionpack/test/dispatch/cookies_test.rb
View file

@ -123,6 +123,11 @@ class CookiesTest < ActionController::TestCase
head :ok head :ok
end end
def set_cookie_if_not_present
cookies["user_name"] = "alice" unless cookies["user_name"].present?
head :ok
end
def logout def logout
cookies.delete("user_name") cookies.delete("user_name")
head :ok head :ok
@ -1128,6 +1133,14 @@ class CookiesTest < ActionController::TestCase
assert_equal "bar", @controller.encrypted_cookie assert_equal "bar", @controller.encrypted_cookie
end end
def test_cookie_override
get :set_cookie_if_not_present
assert_equal "alice", cookies["user_name"]
cookies["user_name"] = "bob"
get :set_cookie_if_not_present
assert_equal "bob", cookies["user_name"]
end
def test_signed_cookie_with_expires_set_relatively def test_signed_cookie_with_expires_set_relatively
request.env["action_dispatch.use_cookies_with_metadata"] = true request.env["action_dispatch.use_cookies_with_metadata"] = true