From 7c000af86726db5f7a2f91e01acacafb49a02f44 Mon Sep 17 00:00:00 2001
From: steve <steve@lesseverything.com>
Date: Thu, 19 May 2011 09:49:16 -0400
Subject: fixing sym and string cookie name, two cookies to browser bug.

---
 actionpack/lib/action_dispatch/middleware/cookies.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index 24ebb8fed7..0057f64dd3 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -167,8 +167,8 @@ module ActionDispatch
 
         handle_options(options)
 
-        @set_cookies[key] = options
-        @delete_cookies.delete(key)
+        @set_cookies[key.to_s] = options
+        @delete_cookies.delete(key.to_s)
         value
       end
 
@@ -181,7 +181,7 @@ module ActionDispatch
         handle_options(options)
 
         value = @cookies.delete(key.to_s)
-        @delete_cookies[key] = options
+        @delete_cookies[key.to_s] = options
         value
       end
 
-- 
cgit v1.2.3


From 2d50887b2437aaee2b051b06367bedfb9949eedf Mon Sep 17 00:00:00 2001
From: steve <steve@lesseverything.com>
Date: Thu, 19 May 2011 10:33:18 -0400
Subject: adding test

---
 actionpack/test/dispatch/cookies_test.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
index ebc16694db..e42c39f527 100644
--- a/actionpack/test/dispatch/cookies_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -121,7 +121,7 @@ class CookiesTest < ActionController::TestCase
     end
 
     def string_key
-      cookies['user_name'] = "david"
+      cookies['user_name'] = "dhh"
       head :ok
     end
 
@@ -417,14 +417,18 @@ class CookiesTest < ActionController::TestCase
     assert_cookie_header "user_name=; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT"
   end
 
+  
   def test_cookies_hash_is_indifferent_access
-    [:symbol_key, :string_key].each do |cookie_key|
-      get cookie_key
+      get :symbol_key
       assert_equal "david", cookies[:user_name]
       assert_equal "david", cookies['user_name']
-    end
+      get :string_key
+      assert_equal "dhh", cookies[:user_name]
+      assert_equal "dhh", cookies['user_name']
   end
 
+
+
   def test_setting_request_cookies_is_indifferent_access
     @request.cookies.clear
     @request.cookies[:user_name] = "andrew"
-- 
cgit v1.2.3