diff options
| author | Cezary Baginski <cezary.baginski@gmail.com> | 2010-04-28 12:24:53 +0200 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-04-28 09:02:03 -0700 |
| commit | 1067a7be52ec8deb208ce46a82f16ed8d0199bd4 (patch) | |
| tree | 10fabee91c6f39374143064d0be9db3b2a918bea /activesupport/test/json | |
| parent | fe93cd8bc58821079a9fd14b99fb78d8d517bf1b (diff) | |
| download | rails-1067a7be52ec8deb208ce46a82f16ed8d0199bd4.tar.gz rails-1067a7be52ec8deb208ce46a82f16ed8d0199bd4.tar.bz2 rails-1067a7be52ec8deb208ce46a82f16ed8d0199bd4.zip | |
Fix BigDecimal JSON encoding test. [#4495 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activesupport/test/json')
| -rw-r--r-- | activesupport/test/json/encoding_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb index ff95c0ca18..ac7ca96c4d 100644 --- a/activesupport/test/json/encoding_test.rb +++ b/activesupport/test/json/encoding_test.rb @@ -26,7 +26,7 @@ class TestJSONEncoding < Test::Unit::TestCase NilTests = [[ nil, %(null) ]] NumericTests = [[ 1, %(1) ], [ 2.5, %(2.5) ], - [ BigDecimal('2.5'), %("#{BigDecimal('2.5').to_s}") ]] + [ BigDecimal('2.5'), %("#{BigDecimal('2.5').to_s('F')}") ]] StringTests = [[ 'this is the <string>', %("this is the \\u003Cstring\\u003E")], [ 'a "string" with quotes & an ampersand', %("a \\"string\\" with quotes \\u0026 an ampersand") ], @@ -126,7 +126,7 @@ class TestJSONEncoding < Test::Unit::TestCase def test_hash_should_allow_key_filtering_with_except assert_equal %({"b":2}), ActiveSupport::JSON.encode({'foo' => 'bar', :b => 2, :c => 3}, :except => ['foo', :c]) end - + def test_time_to_json_includes_local_offset ActiveSupport.use_standard_json_time_format = true with_env_tz 'US/Eastern' do @@ -153,7 +153,7 @@ class TestJSONEncoding < Test::Unit::TestCase def object_keys(json_object) json_object[1..-2].scan(/([^{}:,\s]+):/).flatten.sort end - + def with_env_tz(new_tz = 'US/Eastern') old_tz, ENV['TZ'] = ENV['TZ'], new_tz yield |