diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-31 18:32:16 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-31 18:32:16 -0800 |
| commit | db49b7dc94a744fd53eaf80107995ca55f9415e8 (patch) | |
| tree | d5e3a995db8497941348a3c8843dfe1b784de515 /actionpack | |
| parent | 9790f0eda56b9337f58646e0ce552ae1b5c78316 (diff) | |
| download | rails-db49b7dc94a744fd53eaf80107995ca55f9415e8.tar.gz rails-db49b7dc94a744fd53eaf80107995ca55f9415e8.tar.bz2 rails-db49b7dc94a744fd53eaf80107995ca55f9415e8.zip | |
Fix new year heisenbug
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/test/controller/cookie_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/cookie_test.rb b/actionpack/test/controller/cookie_test.rb index 84d5ce6ad4..c8e8b3857e 100644 --- a/actionpack/test/controller/cookie_test.rb +++ b/actionpack/test/controller/cookie_test.rb @@ -155,7 +155,7 @@ class CookieTest < ActionController::TestCase def test_permanent_cookie get :set_permanent_cookie assert_match /Jamie/, @response.headers["Set-Cookie"] - assert_match %r(#{20.years.from_now.year}), @response.headers["Set-Cookie"] + assert_match %r(#{20.years.from_now.utc.year}), @response.headers["Set-Cookie"] end def test_signed_cookie @@ -165,7 +165,7 @@ class CookieTest < ActionController::TestCase def test_permanent_signed_cookie get :set_permanent_signed_cookie - assert_match %r(#{20.years.from_now.year}), @response.headers["Set-Cookie"] + assert_match %r(#{20.years.from_now.utc.year}), @response.headers["Set-Cookie"] assert_equal 100, @controller.send(:cookies).signed[:remember_me] end |