kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Ruby 1.9 compat: cookie store delete sets nil value instead of empty string 

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8589 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper 2008-01-07 08:12:03 +00:00
parent 3600536b04
commit 7324444344
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_controller/session/cookie_store.rb
View File

@ -117,7 +117,7 @@ class CGI::Session::CookieStore
def delete def delete
@data = nil @data = nil
clear_old_cookie_value clear_old_cookie_value
write_cookie('value' => '', 'expires' => 1.year.ago) write_cookie('value' => nil, 'expires' => 1.year.ago)
end end
# Generate the HMAC keyed message digest. Uses SHA1 by default. # Generate the HMAC keyed message digest. Uses SHA1 by default.

2
actionpack/test/controller/session/cookie_store_test.rb
View File

@ -175,7 +175,7 @@ class CookieStoreTest < Test::Unit::TestCase
def assert_cookie_deleted(session, message = 'Expected session deletion cookie to be set') def assert_cookie_deleted(session, message = 'Expected session deletion cookie to be set')
assert_equal 1, session.cgi.output_cookies.size assert_equal 1, session.cgi.output_cookies.size
cookie = session.cgi.output_cookies.first cookie = session.cgi.output_cookies.first
assert_cookie cookie, nil, 1.year.ago.to_date, message assert_cookie cookie, nil, 1.year.ago.to_date, "#{message}: #{cookie.name} => #{cookie.value}"
end end
def assert_cookie(cookie, value = nil, expires = nil, message = nil) def assert_cookie(cookie, value = nil, expires = nil, message = nil)