diff options
author | gbuesing <gbuesing@gmail.com> | 2008-07-14 23:16:39 -0500 |
---|---|---|
committer | gbuesing <gbuesing@gmail.com> | 2008-07-14 23:16:39 -0500 |
commit | 34510456585216004e483b79beeea3ddc3eb4de6 (patch) | |
tree | 39e186f2e5e41d4a61e659db10c25361aced73be /activesupport/test | |
parent | 7f0346237e30e55d6cd16a8b4a9dfe4193f61804 (diff) | |
download | rails-34510456585216004e483b79beeea3ddc3eb4de6.tar.gz rails-34510456585216004e483b79beeea3ddc3eb4de6.tar.bz2 rails-34510456585216004e483b79beeea3ddc3eb4de6.zip |
Fix TimeWithZone unmarshaling: coerce unmarshaled Time instances to utc, because Ruby's marshaling of Time instances doesn't respect the zone
Diffstat (limited to 'activesupport/test')
-rw-r--r-- | activesupport/test/core_ext/time_with_zone_test.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb index ac52a1be0b..dfe04485be 100644 --- a/activesupport/test/core_ext/time_with_zone_test.rb +++ b/activesupport/test/core_ext/time_with_zone_test.rb @@ -320,8 +320,11 @@ class TimeWithZoneTest < Test::Unit::TestCase marshal_str = Marshal.dump(@twz) mtime = Marshal.load(marshal_str) assert_equal Time.utc(2000, 1, 1, 0), mtime.utc + assert mtime.utc.utc? assert_equal ActiveSupport::TimeZone['Eastern Time (US & Canada)'], mtime.time_zone assert_equal Time.utc(1999, 12, 31, 19), mtime.time + assert mtime.time.utc? + assert_equal @twz.inspect, mtime.inspect end end @@ -331,8 +334,11 @@ class TimeWithZoneTest < Test::Unit::TestCase marshal_str = Marshal.dump(twz) mtime = Marshal.load(marshal_str) assert_equal Time.utc(2000, 1, 1, 0), mtime.utc + assert mtime.utc.utc? assert_equal 'America/New_York', mtime.time_zone.name assert_equal Time.utc(1999, 12, 31, 19), mtime.time + assert mtime.time.utc? + assert_equal @twz.inspect, mtime.inspect end end |