From 1c60db55ac07b238d9d4e1443f5b6f8dd1fa9da0 Mon Sep 17 00:00:00 2001
From: tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 3 Oct 2011 21:31:43 +0000
Subject: * ext/psych/lib/psych.rb: calling `yaml` rather than `to_yaml`. *
 ext/psych/lib/psych/nodes/node.rb: Rename `to_yaml` to just `yaml`   in order
 to avoid YAML::ENGINE switching from replacing this method. *
 test/psych/helper.rb: fix tests for method name change. *
 test/psych/test_document.rb: ditto * test/psych/visitors/test_emitter.rb:
 ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/psych/helper.rb                |  2 +-
 test/psych/test_document.rb         |  8 ++++----
 test/psych/visitors/test_emitter.rb | 16 ++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'test')

diff --git a/test/psych/helper.rb b/test/psych/helper.rb
index fd23c3be07..f5800303fd 100644
--- a/test/psych/helper.rb
+++ b/test/psych/helper.rb
@@ -33,7 +33,7 @@ module Psych
     def assert_cycle( obj )
       v = Visitors::YAMLTree.new
       v << obj
-      assert_equal(obj, Psych.load(v.tree.to_yaml))
+      assert_equal(obj, Psych.load(v.tree.yaml))
       assert_equal( obj, Psych::load(Psych.dump(obj)))
       assert_equal( obj, Psych::load( obj.psych_to_yaml ) )
     end
diff --git a/test/psych/test_document.rb b/test/psych/test_document.rb
index 55add5f4dd..05d9bbfb87 100644
--- a/test/psych/test_document.rb
+++ b/test/psych/test_document.rb
@@ -18,12 +18,12 @@ module Psych
     end
 
     def test_emit_tag
-      assert_match('%TAG ! tag:tenderlovemaking.com,2009:', @stream.to_yaml)
+      assert_match('%TAG ! tag:tenderlovemaking.com,2009:', @stream.yaml)
     end
 
     def test_emit_multitag
       @doc.tag_directives << ['!!', 'foo.com,2009:']
-      yaml = @stream.to_yaml
+      yaml = @stream.yaml
       assert_match('%TAG ! tag:tenderlovemaking.com,2009:', yaml)
       assert_match('%TAG !! foo.com,2009:', yaml)
     end
@@ -31,7 +31,7 @@ module Psych
     def test_emit_bad_tag
       assert_raises(RuntimeError) do
         @doc.tag_directives = [['!']]
-        @stream.to_yaml
+        @stream.yaml
       end
     end
 
@@ -40,7 +40,7 @@ module Psych
     end
 
     def test_emit_version
-      assert_match('%YAML 1.1', @stream.to_yaml)
+      assert_match('%YAML 1.1', @stream.yaml)
     end
   end
 end
diff --git a/test/psych/visitors/test_emitter.rb b/test/psych/visitors/test_emitter.rb
index de27b4588c..780c953693 100644
--- a/test/psych/visitors/test_emitter.rb
+++ b/test/psych/visitors/test_emitter.rb
@@ -46,7 +46,7 @@ module Psych
         @visitor.accept s
 
         assert_match(/1.1/, @io.string)
-        assert_equal @io.string, s.to_yaml
+        assert_equal @io.string, s.yaml
       end
 
       def test_document_implicit_end
@@ -61,8 +61,8 @@ module Psych
         @visitor.accept s
 
         assert_match(/key: value/, @io.string)
-        assert_equal @io.string, s.to_yaml
-        assert(/\.\.\./ !~ s.to_yaml)
+        assert_equal @io.string, s.yaml
+        assert(/\.\.\./ !~ s.yaml)
       end
 
       def test_scalar
@@ -76,7 +76,7 @@ module Psych
         @visitor.accept s
 
         assert_match(/hello/, @io.string)
-        assert_equal @io.string, s.to_yaml
+        assert_equal @io.string, s.yaml
       end
 
       def test_scalar_with_tag
@@ -91,7 +91,7 @@ module Psych
 
         assert_match(/str/, @io.string)
         assert_match(/hello/, @io.string)
-        assert_equal @io.string, s.to_yaml
+        assert_equal @io.string, s.yaml
       end
 
       def test_sequence
@@ -107,7 +107,7 @@ module Psych
         @visitor.accept s
 
         assert_match(/- hello/, @io.string)
-        assert_equal @io.string, s.to_yaml
+        assert_equal @io.string, s.yaml
       end
 
       def test_mapping
@@ -122,7 +122,7 @@ module Psych
         @visitor.accept s
 
         assert_match(/key: value/, @io.string)
-        assert_equal @io.string, s.to_yaml
+        assert_equal @io.string, s.yaml
       end
 
       def test_alias
@@ -137,7 +137,7 @@ module Psych
         @visitor.accept s
 
         assert_match(/&A key: \*A/, @io.string)
-        assert_equal @io.string, s.to_yaml
+        assert_equal @io.string, s.yaml
       end
     end
   end
-- 
cgit v1.2.3