Fixed tests so that they will also run properly in other timezones.

rails · Sep 15, 2011 · a8aaef6 · a8aaef6
1 parent bffaa88
commit a8aaef6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/activesupport/test/message_encryptor_test.rb b/activesupport/test/message_encryptor_test.rb
@@ -44,8 +44,8 @@ def test_alternative_serialization_method
     @encryptor.serializer = lambda { |value| ActiveSupport::JSON.encode(value) }
     @encryptor.deserializer = lambda { |value| ActiveSupport::JSON.decode(value) }
 
-    message = @encryptor.encrypt_and_sign({ :foo => 123, 'bar' => Time.local(2010) })
-    assert_equal @encryptor.decrypt_and_verify(message), { "foo" => 123, "bar" => "2010-01-01T00:00:00-05:00" }
+    message = @encryptor.encrypt_and_sign({ :foo => 123, 'bar' => Time.utc(2010) })
+    assert_equal @encryptor.decrypt_and_verify(message), { "foo" => 123, "bar" => "2010-01-01T00:00:00Z" }
   end
 
   private

diff --git a/activesupport/test/message_verifier_test.rb b/activesupport/test/message_verifier_test.rb
@@ -37,8 +37,8 @@ def test_alternative_serialization_method
     @verifier.serializer = lambda { |value| ActiveSupport::JSON.encode(value) }
     @verifier.deserializer = lambda { |value| ActiveSupport::JSON.decode(value) }
 
-    message = @verifier.generate({ :foo => 123, 'bar' => Time.local(2010) })
-    assert_equal @verifier.verify(message), { "foo" => 123, "bar" => "2010-01-01T00:00:00-05:00" }
+    message = @verifier.generate({ :foo => 123, 'bar' => Time.utc(2010) })
+    assert_equal @verifier.verify(message), { "foo" => 123, "bar" => "2010-01-01T00:00:00Z" }
   end
 
   def assert_not_verified(message)