synching with ruby trunk

3 files changed, 8 insertions, 2 deletions

diff --git a/test/psych/json/test_stream.rb b/test/psych/json/test_stream.rb
index 0af64c1..4690ad2 100644
--- a/test/psych/json/test_stream.rb
+++ b/test/psych/json/test_stream.rb
@@ -95,7 +95,7 @@ module Psych
         time = Time.utc(2010, 10, 10)
         @stream.push({'a' => time })
         json = @io.string
-        assert_match "{\"a\": \"2010-10-10 00:00:00.000000000Z\"}\n", json
+        assert_match "{\"a\": \"2010-10-10 00:00:00.000000000 Z\"}\n", json
       end
 
       def test_datetime
diff --git a/test/psych/test_json_tree.rb b/test/psych/test_json_tree.rb
index fefa1f5..eed8cf3 100644
--- a/test/psych/test_json_tree.rb
+++ b/test/psych/test_json_tree.rb
@@ -53,7 +53,7 @@ module Psych
 
     def test_time
       time = Time.utc(2010, 10, 10)
-      assert_equal "{\"a\": \"2010-10-10 00:00:00.000000000Z\"}\n",
+      assert_equal "{\"a\": \"2010-10-10 00:00:00.000000000 Z\"}\n",
 Psych.to_json({'a' => time })
     end
 
diff --git a/test/psych/test_yaml.rb b/test/psych/test_yaml.rb
index 5c2f6dc..41bb377 100644
--- a/test/psych/test_yaml.rb
+++ b/test/psych/test_yaml.rb
@@ -14,6 +14,12 @@ class Psych_Unit_Tests < Psych::TestCase
         Psych.domain_types.clear
     end
 
+    def test_syck_compat
+      time = Time.utc(2010, 10, 10)
+      yaml = Psych.dump time
+      assert_match "2010-10-10 00:00:00.000000000 Z", yaml
+    end
+
     # [ruby-core:34969]
     def test_regexp_with_n
         assert_cycle(Regexp.new('',0,'n'))