github
/
ruby
зеркало из https://github.com/github/ruby.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fixed tests broken by new minitest mixin 

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33039 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ryan 2011-08-23 22:34:13 +00:00
Родитель 2c43b9664b
Коммит d1919daa42
1 изменённых файлов: 8 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
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