From 1a5304228a03139b55821985856628cfe7362966 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 2 Dec 2018 11:36:45 +0900 Subject: Use test-unit instead of minitest Minitest 6 will err `assert_equal` with `nil`. https://github.com/seattlerb/minitest/issues/779 --- test/rdoc/minitest_helper.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'test/rdoc') diff --git a/test/rdoc/minitest_helper.rb b/test/rdoc/minitest_helper.rb index 50e41ebdd2..f22e4162ee 100644 --- a/test/rdoc/minitest_helper.rb +++ b/test/rdoc/minitest_helper.rb @@ -1,13 +1,13 @@ # frozen_string_literal: true require 'bundler/errors' begin - gem 'minitest', '~> 5.0' + gem 'test-unit' rescue NoMethodError, Gem::LoadError, Bundler::GemfileNotFound # for ruby tests end -require 'minitest/autorun' -require 'minitest/benchmark' unless ENV['NOBENCHMARK'] +require 'test-unit' +# require 'minitest/benchmark' unless ENV['NOBENCHMARK'] require 'fileutils' require 'pp' @@ -30,7 +30,7 @@ require 'rdoc' # * @pwd containing the current working directory # * FileUtils, pp, Tempfile, Dir.tmpdir and StringIO -class RDoc::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase) +class RDoc::TestCase < Test::Unit::TestCase ## # Abstract test-case setup @@ -202,4 +202,7 @@ class RDoc::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Un end end end + + alias capture_io capture_output + alias skip omit end -- cgit v1.2.3