From d1919daa4282b29d22240c7fee977afbcbc7ea58 Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 23 Aug 2011 22:34:13 +0000 Subject: [PATCH] fixed tests broken by new minitest mixin git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33039 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_module.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index e2680dd700..a51681d29b 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -79,6 +79,10 @@ class TestModule < Test::Unit::TestCase } end + def remove_minitest_mixins(list) + list.reject {|c| c.to_s.start_with?("MiniTest") } + end + module Mixin MIXIN = 1 def mixin @@ -217,9 +221,9 @@ class TestModule < Test::Unit::TestCase assert_equal([Mixin], Mixin.ancestors) assert_equal([Object, Kernel, BasicObject], - remove_rake_mixins(remove_json_mixins(remove_pp_mixins(Object.ancestors)))) + remove_minitest_mixins(remove_rake_mixins(remove_json_mixins(remove_pp_mixins(Object.ancestors))))) assert_equal([String, Comparable, Object, Kernel, BasicObject], - remove_rake_mixins(remove_json_mixins(remove_pp_mixins(String.ancestors)))) + remove_minitest_mixins(remove_rake_mixins(remove_json_mixins(remove_pp_mixins(String.ancestors))))) end CLASS_EVAL = 2 @@ -277,9 +281,9 @@ class TestModule < Test::Unit::TestCase assert_equal([], Mixin.included_modules) assert_equal([Mixin], User.included_modules) assert_equal([Kernel], - remove_rake_mixins(remove_json_mixins(remove_pp_mixins(Object.included_modules)))) + remove_minitest_mixins(remove_rake_mixins(remove_json_mixins(remove_pp_mixins(Object.included_modules))))) assert_equal([Comparable, Kernel], - remove_rake_mixins(remove_json_mixins(remove_pp_mixins(String.included_modules)))) + remove_minitest_mixins(remove_rake_mixins(remove_json_mixins(remove_pp_mixins(String.included_modules))))) end def test_instance_methods