diff options
| author | Rich Cavanaugh <cavanaugh@fatjam.com> | 2008-05-13 12:19:27 -0400 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-05-13 10:51:55 -0700 |
| commit | d8bcec6ce6b48f271af5c566791417a58b8a617d (patch) | |
| tree | 9254feb851340e20e3121b6461984b376126aed3 /actionpack | |
| parent | d16fbe53b202d52b5ef12526941ed50da2daf38f (diff) | |
| download | rails-d8bcec6ce6b48f271af5c566791417a58b8a617d.tar.gz rails-d8bcec6ce6b48f271af5c566791417a58b8a617d.tar.bz2 rails-d8bcec6ce6b48f271af5c566791417a58b8a617d.zip | |
make CGI::Cookie handle deleting a cookie properly
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/cgi_ext/cookie.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/cookie_test.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/cgi_ext/cookie.rb b/actionpack/lib/action_controller/cgi_ext/cookie.rb index e35bab5f5a..a244e2a39a 100644 --- a/actionpack/lib/action_controller/cgi_ext/cookie.rb +++ b/actionpack/lib/action_controller/cgi_ext/cookie.rb @@ -37,7 +37,7 @@ class CGI #:nodoc: @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 index b8f3c629f4..b45fbb17d3 100644 --- a/actionpack/test/controller/cookie_test.rb +++ b/actionpack/test/controller/cookie_test.rb @@ -82,6 +82,7 @@ class CookieTest < Test::Unit::TestCase 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 |