diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2013-02-06 12:33:28 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2013-02-06 12:33:28 -0800 |
| commit | c7598134a42406fc83d08cf44fa29fb46eeb2fe7 (patch) | |
| tree | e0007645f384c0611fc45d3deb1da44bb26678ff /activesupport/test | |
| parent | f14dcc058e8a51d7456b34329d84c06676780f23 (diff) | |
| parent | 28ab79d7c579fa1d76ac868be02b38b02818428a (diff) | |
| download | rails-c7598134a42406fc83d08cf44fa29fb46eeb2fe7.tar.gz rails-c7598134a42406fc83d08cf44fa29fb46eeb2fe7.tar.bz2 rails-c7598134a42406fc83d08cf44fa29fb46eeb2fe7.zip | |
Merge pull request #9128 from jamesotron/iso8601-sub-second-accuracy
Modify TimeWithZone#as_json to return 3DP of sub-second accuracy.
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/core_ext/time_with_zone_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb index 18eca4cd8b..c2b3676aac 100644 --- a/activesupport/test/core_ext/time_with_zone_test.rb +++ b/activesupport/test/core_ext/time_with_zone_test.rb @@ -75,7 +75,7 @@ class TimeWithZoneTest < ActiveSupport::TestCase 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\"", ActiveSupport::JSON.encode(@twz) + assert_equal "\"1999-12-31T19:00:00.000-05:00\"", ActiveSupport::JSON.encode(@twz) ensure ActiveSupport.use_standard_json_time_format = old end |