diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2019-03-19 21:19:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 21:19:45 -0400 |
| commit | 7c6343078a566264ce6df6e531c9790ff2d2f432 (patch) | |
| tree | c452643ae06d9de65073892ba91ad8f573a56c34 /actionpack/lib/action_dispatch | |
| parent | 3dee96e92b08edafa2a7be6964b0596bb738f709 (diff) | |
| parent | ca937c59cd69c05cbb92bad4839d931061e15b69 (diff) | |
| download | rails-7c6343078a566264ce6df6e531c9790ff2d2f432.tar.gz rails-7c6343078a566264ce6df6e531c9790ff2d2f432.tar.bz2 rails-7c6343078a566264ce6df6e531c9790ff2d2f432.zip | |
Merge pull request #35649 from andrehjr/fix-override-of-cookies-controller-specs
Don't override @set_cookies on CookieJar#update_cookies_from_jar'
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/cookies.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb index 1611a8b3dd..b69bcab05c 100644 --- a/actionpack/lib/action_dispatch/middleware/cookies.rb +++ b/actionpack/lib/action_dispatch/middleware/cookies.rb @@ -338,7 +338,7 @@ module ActionDispatch def update_cookies_from_jar 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 end |