make CGI::Cookie handle deleting a cookie properly

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
rails · May 13, 2008 · d8bcec6 · d8bcec6
1 parent d16fbe5
commit d8bcec6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/actionpack/lib/action_controller/cgi_ext/cookie.rb b/actionpack/lib/action_controller/cgi_ext/cookie.rb
@@ -37,7 +37,7 @@ def initialize(name = '', *value)
         @path = nil
       else
         @name = name['name']
-        @value = name['value'].kind_of?(String) ? [name['value']] : Array(name['value'])
+        @value = (name['value'].kind_of?(String) ? [name['value']] : Array(name['value'])).delete_if(&:blank?)
         @domain = name['domain']
         @expires = name['expires']
         @secure = name['secure'] || false

diff --git a/actionpack/test/controller/cookie_test.rb b/actionpack/test/controller/cookie_test.rb
@@ -82,6 +82,7 @@ def test_setting_test_cookie
   def test_expiring_cookie
     get :logout
     assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "", "expires" => Time.at(0)) ], @response.headers["cookie"]
+    assert_equal CGI::Cookie::new("name" => "user_name", "value" => "", "expires" => Time.at(0)).value, []
   end  
 
   def test_cookiejar_accessor