diff options
author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-17 18:17:46 +0000 |
---|---|---|
committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-17 18:17:46 +0000 |
commit | f595568e475b225b2ee5cce9d4667ba551177ee6 (patch) | |
tree | f664bc35af3f156f02cf3fd2fffefb3e77827250 /test | |
parent | c934771ca9ca54bb20f01b818035873594793dfa (diff) | |
download | ruby-f595568e475b225b2ee5cce9d4667ba551177ee6.tar.gz |
* ext/psych/lib/psych.rb: bump psych version.
* ext/psych/psych.gemspec: ditto
* ext/psych/yaml/scanner.c: add latest libyaml change.
* test/psych/helper.rb: support newer minitest
* test/psych/test_to_yaml_properties.rb: ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/psych/helper.rb | 8 | ||||
-rw-r--r-- | test/psych/test_to_yaml_properties.rb | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/test/psych/helper.rb b/test/psych/helper.rb index 11b2216b20..0111e11337 100644 --- a/test/psych/helper.rb +++ b/test/psych/helper.rb @@ -5,7 +5,13 @@ require 'date' require 'psych' module Psych - class TestCase < MiniTest::Unit::TestCase + superclass = if defined?(Minitest::Test) + Minitest::Test + else + MiniTest::Unit::TestCase + end + + class TestCase < superclass def self.suppress_warning verbose, $VERBOSE = $VERBOSE, nil yield diff --git a/test/psych/test_to_yaml_properties.rb b/test/psych/test_to_yaml_properties.rb index 5b4860c435..724aab4f0e 100644 --- a/test/psych/test_to_yaml_properties.rb +++ b/test/psych/test_to_yaml_properties.rb @@ -1,7 +1,7 @@ require_relative 'helper' module Psych - class TestToYamlProperties < MiniTest::Unit::TestCase + class TestToYamlProperties < Psych::TestCase class Foo attr_accessor :a, :b, :c def initialize |