aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test/ruby/test_module.rb12
1 files 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