diff options
| author | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-23 23:05:34 +0000 |
|---|---|---|
| committer | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-23 23:05:34 +0000 |
| commit | 0ed77bc70ffc61033c6dea291111396720b23847 (patch) | |
| tree | aa63659001c5b66343fbf059318ece662d71828c /test | |
| parent | e5f7bf8442028299833bc3a3323e9a48080d9d80 (diff) | |
backported r33039
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_module.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index a35e98119b..a05e11726c 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 |