Ensure cookie keys are strings

2 files changed, 12 insertions, 2 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index c4a83fc8cb..01ffb91cf9 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -1,4 +1,5 @@
-require "active_support/core_ext/object/blank"
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/hash/keys'
 
 module ActionDispatch
   class Request
@@ -129,7 +130,7 @@ module ActionDispatch
       end
 
       def update(other_hash)
-        @cookies.update other_hash
+        @cookies.update other_hash.stringify_keys
         self
       end
 
diff --git a/actionpack/test/dispatch/test_request_test.rb b/actionpack/test/dispatch/test_request_test.rb
index c520fb59ec..aa115608ef 100644
--- a/actionpack/test/dispatch/test_request_test.rb
+++ b/actionpack/test/dispatch/test_request_test.rb
@@ -39,6 +39,15 @@ class TestRequestTest < ActiveSupport::TestCase
 
     req.cookie_jar["login"] = "XJ-122"
     assert_cookies({"user_name" => "david", "login" => "XJ-122"}, req.cookie_jar)
+
+    req.cookie_jar.delete(:login)
+    assert_cookies({"user_name" => "david"}, req.cookie_jar)
+
+    req.cookie_jar.clear
+    assert_cookies({}, req.cookie_jar)
+
+    req.cookie_jar.update(:user_name => "david")
+    assert_cookies({"user_name" => "david"}, req.cookie_jar)
   end
 
   private