diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 14:34:37 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 14:34:37 +0100 |
| commit | ae812c0a7bdb876c03752adfaa980ac4e74f2e17 (patch) | |
| tree | 73eba5b0ddce60a4578fcbf6be581b8f35488273 /activesupport/test/core_ext/time_with_zone_test.rb | |
| parent | 67f30fd9639409877a57a7ba758cd13496433d69 (diff) | |
| parent | 3c4c6bd0df598f865f49a983b4c65c415af4bcfc (diff) | |
| download | rails-ae812c0a7bdb876c03752adfaa980ac4e74f2e17.tar.gz rails-ae812c0a7bdb876c03752adfaa980ac4e74f2e17.tar.bz2 rails-ae812c0a7bdb876c03752adfaa980ac4e74f2e17.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'activesupport/test/core_ext/time_with_zone_test.rb')
| -rw-r--r-- | activesupport/test/core_ext/time_with_zone_test.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb index 3dec4c95f4..0380c28c17 100644 --- a/activesupport/test/core_ext/time_with_zone_test.rb +++ b/activesupport/test/core_ext/time_with_zone_test.rb @@ -1,5 +1,6 @@ require 'abstract_unit' require 'active_support/time_with_zone' +require 'active_support/json' class TimeWithZoneTest < Test::Unit::TestCase @@ -56,12 +57,12 @@ class TimeWithZoneTest < Test::Unit::TestCase end def test_to_json - assert_equal "\"1999/12/31 19:00:00 -0500\"", @twz.to_json + assert_equal "\"1999/12/31 19:00:00 -0500\"", ActiveSupport::JSON.encode(@twz) end def test_to_json_with_use_standard_json_time_format_config_set_to_true old, ActiveSupport.use_standard_json_time_format = ActiveSupport.use_standard_json_time_format, true - assert_equal "\"1999-12-31T19:00:00-05:00\"", @twz.to_json + assert_equal "\"1999-12-31T19:00:00-05:00\"", ActiveSupport::JSON.encode(@twz) ensure ActiveSupport.use_standard_json_time_format = old end |