aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-03-28 05:38:32 +0200
committerJosé Valim <jose.valim@gmail.com>2010-03-28 05:38:32 +0200
commit8398f21880a952769ccd6437a4344922fe596dab (patch)
treed2a3f04fd3020c1b5d88847af62d52f2d5e5bd61 /activesupport
parentedd59b7bb9307f949caf495766da3ba1bb40463a (diff)
downloadrails-8398f21880a952769ccd6437a4344922fe596dab.tar.gz
rails-8398f21880a952769ccd6437a4344922fe596dab.tar.bz2
rails-8398f21880a952769ccd6437a4344922fe596dab.zip
Time zone tests were right all along.
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/test/core_ext/time_ext_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb
index bb8256fda9..159b7d8366 100644
--- a/activesupport/test/core_ext/time_ext_test.rb
+++ b/activesupport/test/core_ext/time_ext_test.rb
@@ -761,7 +761,7 @@ class TimeExtMarshalingTest < Test::Unit::TestCase
marshaled = Marshal.dump t
unmarshaled = Marshal.load marshaled
assert_equal t, unmarshaled
- assert_equal t.zone, unmarshaled.zone
+ assert_equal "UTC", unmarshaled.zone
end
def test_marshaling_with_local_instance
@@ -769,7 +769,7 @@ class TimeExtMarshalingTest < Test::Unit::TestCase
marshaled = Marshal.dump t
unmarshaled = Marshal.load marshaled
assert_equal t, unmarshaled
- assert_equal "UTC", unmarshaled.zone
+ assert_equal t.zone, unmarshaled.zone
end
def test_marshaling_with_frozen_utc_instance
@@ -777,7 +777,7 @@ class TimeExtMarshalingTest < Test::Unit::TestCase
marshaled = Marshal.dump t
unmarshaled = Marshal.load marshaled
assert_equal t, unmarshaled
- assert_equal t.zone, unmarshaled.zone
+ assert_equal "UTC", unmarshaled.zone
end
def test_marshaling_with_frozen_local_instance
@@ -785,6 +785,6 @@ class TimeExtMarshalingTest < Test::Unit::TestCase
marshaled = Marshal.dump t
unmarshaled = Marshal.load marshaled
assert_equal t, unmarshaled
- assert_equal "UTC", unmarshaled.zone
+ assert_equal t.zone, unmarshaled.zone
end
end