From 95fc90723bb041134c8fe3be8714e8599664ce8b Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 17 Aug 2011 11:54:07 -0700
Subject: syncing with ruby trunk

---
 test/psych/test_engine_manager.rb | 2 +-
 test/psych/test_yaml.rb           | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/psych/test_engine_manager.rb b/test/psych/test_engine_manager.rb
index d52a80e..b52fd09 100644
--- a/test/psych/test_engine_manager.rb
+++ b/test/psych/test_engine_manager.rb
@@ -21,7 +21,7 @@ module Psych
 
    def test_set_syck
      YAML::ENGINE.yamler = 'syck'
-     assert_equal Syck, YAML
+     assert_equal ::Syck, YAML
      assert_equal 'syck', YAML::ENGINE.yamler
    end
 
diff --git a/test/psych/test_yaml.rb b/test/psych/test_yaml.rb
index 41bb377..807c058 100644
--- a/test/psych/test_yaml.rb
+++ b/test/psych/test_yaml.rb
@@ -3,6 +3,7 @@
 # $Id$
 #
 require 'psych/helper'
+require 'ostruct'
 
 # [ruby-core:01946]
 module Psych_Tests
@@ -14,6 +15,12 @@ class Psych_Unit_Tests < Psych::TestCase
         Psych.domain_types.clear
     end
 
+    def test_y_method
+      assert_raises(NoMethodError) do
+        OpenStruct.new.y 1
+      end
+    end
+
     def test_syck_compat
       time = Time.utc(2010, 10, 10)
       yaml = Psych.dump time
-- 
cgit v1.2.3