aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/json
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-07-01 19:03:18 -0300
committerJosé Valim <jose.valim@gmail.com>2010-07-02 01:51:03 +0200
commitcb321546b7aef33fcf5466b61f79bd9198cd12b5 (patch)
treed88f876b8685f3b58a5b89046c4aec5778d0c09b /activesupport/test/json
parentf7ba614c2db31933cbc12eda87518de3eca0228c (diff)
downloadrails-cb321546b7aef33fcf5466b61f79bd9198cd12b5.tar.gz
rails-cb321546b7aef33fcf5466b61f79bd9198cd12b5.tar.bz2
rails-cb321546b7aef33fcf5466b61f79bd9198cd12b5.zip
Time has it own implementation of xmlschema, now AMo doesn't depend on TZInfo
[#4979 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activesupport/test/json')
-rw-r--r--activesupport/test/json/encoding_test.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb
index a8ecf4e4cf..a679efb41e 100644
--- a/activesupport/test/json/encoding_test.rb
+++ b/activesupport/test/json/encoding_test.rb
@@ -1,7 +1,5 @@
# encoding: utf-8
require 'abstract_unit'
-require 'bigdecimal'
-require 'active_support/core_ext/big_decimal/conversions'
require 'active_support/json'
class TestJSONEncoding < Test::Unit::TestCase
@@ -138,6 +136,10 @@ class TestJSONEncoding < Test::Unit::TestCase
ActiveSupport.use_standard_json_time_format = false
end
+ def test_hash_with_time_to_json
+ assert_equal '{"time":"2009/01/01 00:00:00 +0000"}', { :time => Time.utc(2009) }.to_json
+ end
+
def test_nested_hash_with_float
assert_nothing_raised do
hash = {