Skip to content

Commit bb448b7

Browse files
committed
Use test-unit instead of minitest
Minitest 6 will err `assert_equal` with `nil`. minitest/minitest#779
1 parent f5e680a commit bb448b7

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

lib/rdoc/markup/formatter_test_case.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
2-
require 'minitest/unit'
2+
require 'test-unit'
33

44
##
55
# Test case for creating new RDoc::Markup formatters. See

test/minitest_helper.rb

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# frozen_string_literal: true
22
require 'bundler/errors'
33
begin
4-
gem 'minitest', '~> 5.0'
4+
gem 'test-unit'
55
rescue NoMethodError, Gem::LoadError, Bundler::GemfileNotFound
66
# for ruby tests
77
end
88

9-
require 'minitest/autorun'
10-
require 'minitest/benchmark' unless ENV['NOBENCHMARK']
9+
require 'test-unit'
10+
# require 'minitest/benchmark' unless ENV['NOBENCHMARK']
1111

1212
require 'fileutils'
1313
require 'pp'
@@ -30,7 +30,7 @@
3030
# * <code>@pwd</code> containing the current working directory
3131
# * FileUtils, pp, Tempfile, Dir.tmpdir and StringIO
3232

33-
class RDoc::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase)
33+
class RDoc::TestCase < Test::Unit::TestCase
3434

3535
##
3636
# Abstract test-case setup
@@ -192,7 +192,7 @@ def verb *parts
192192
# run capture_io with setting $VERBOSE = true
193193

194194
def verbose_capture_io
195-
capture_io do
195+
capture_output do
196196
begin
197197
orig_verbose = $VERBOSE
198198
$VERBOSE = true
@@ -202,4 +202,7 @@ def verbose_capture_io
202202
end
203203
end
204204
end
205+
206+
alias capture_io capture_output
207+
alias skip omit
205208
end

0 commit comments

Comments
 (0)