diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-11 01:34:52 -0200 |
---|---|---|
committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-25 17:28:41 -0200 |
commit | 7d624e0e8cfa3adffd8f475e3588d83f3b367c24 (patch) | |
tree | 15a0cfd3d7f48e762090a042ec01b33ccd70e134 /actionpack/test/dispatch/session | |
parent | 01341e3e432f0602891fe226ed1f2d079f590327 (diff) | |
download | rails-7d624e0e8cfa3adffd8f475e3588d83f3b367c24.tar.gz rails-7d624e0e8cfa3adffd8f475e3588d83f3b367c24.tar.bz2 rails-7d624e0e8cfa3adffd8f475e3588d83f3b367c24.zip |
Integrate Action Pack with Rack 1.5
All ActionPack and Railties tests are passing. Closes #8891.
[Carlos Antonio da Silva + Santiago Pastorino]
Diffstat (limited to 'actionpack/test/dispatch/session')
-rw-r--r-- | actionpack/test/dispatch/session/cookie_store_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb index 1677dee524..d8bf22dec8 100644 --- a/actionpack/test/dispatch/session/cookie_store_test.rb +++ b/actionpack/test/dispatch/session/cookie_store_test.rb @@ -276,7 +276,7 @@ class CookieStoreTest < ActionDispatch::IntegrationTest # First request accesses the session time = Time.local(2008, 4, 24) Time.stubs(:now).returns(time) - expected_expiry = (time + 5.hours).gmtime.strftime("%a, %d-%b-%Y %H:%M:%S GMT") + expected_expiry = (time + 5.hours).gmtime.strftime("%a, %d %b %Y %H:%M:%S -0000") cookies[SessionKey] = SignedBar @@ -290,7 +290,7 @@ class CookieStoreTest < ActionDispatch::IntegrationTest # Second request does not access the session time = Time.local(2008, 4, 25) Time.stubs(:now).returns(time) - expected_expiry = (time + 5.hours).gmtime.strftime("%a, %d-%b-%Y %H:%M:%S GMT") + expected_expiry = (time + 5.hours).gmtime.strftime("%a, %d %b %Y %H:%M:%S -0000") get '/no_session_access' assert_response :success |