Merge branch 'master' into jruby

* master:
  Adding Rubinius as an Allowed Failure
  bump version
  Fix CVE-2014-9130
  Adding RVM listing for Rubinius
  fix minitest warnings
  * ext/psych/lib/psych/visitors/yaml_tree.rb: register nodes when   dumping objects with custom coders. [ruby-core:66215] [Bug #10496]
  * ext/psych/lib/psych/visitors/to_ruby.rb: fix support for regular   expressions with newlines. tenderlove/psych#222
  * ext/psych/lib/psych/visitors/to_ruby.rb: fix parsing hashes with   instance variables when it is referenced multiple times. * ext/psych/lib/psych.rb: bump version * ext/psych/psych.gemspec: bump version * test/psych/test_hash.rb: test for fix
  bump version
  Fix anchor
  Fix assertion regexps
  bump version
  Only dump ivars for subclasses of String, not for String. With cf0dd2b93f1552a3c452a0bfa0e996f441d5e27e, fixes #217.
  Only dump ivars for subclasses of Hash, not for Hash. Fixes #216. Fixes part of #217.
  Fix block chomping and add more tests
  Preset @line_width in YAMLTree#initialize for better performance
  Use appropriate style for serialized strings
  Remove unnnecessary 'str' variable in YAMLTree#visit_String

1 files changed, 7 insertions, 1 deletions

diff --git a/test/psych/helper.rb b/test/psych/helper.rb
index 468beac..f28ac0f 100644
--- a/test/psych/helper.rb
+++ b/test/psych/helper.rb
@@ -6,7 +6,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