Skip to content

Commit 435b719

Browse files
authored
Merge pull request #606 from ruby/minitest5
Use Minitest 5
2 parents 67b3959 + 05c8efe commit 435b719

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ end
3535

3636
Rake::TestTask.new(:test) do |t|
3737
t.libs << "test"
38-
t.libs << "lib"
38+
t.verbose = true
3939
t.test_files = FileList['test/**/test_*.rb']
4040
end
4141

lib/rdoc.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,6 @@ def self.load_yaml
125125

126126
autoload :RDoc, 'rdoc/rdoc'
127127

128-
autoload :TestCase, 'rdoc/test_case'
129-
130128
autoload :CrossReference, 'rdoc/cross_reference'
131129
autoload :ERBIO, 'rdoc/erbio'
132130
autoload :ERBPartial, 'rdoc/erb_partial'

rdoc.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,5 @@ RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentat
6363
s.add_development_dependency("rake")
6464
s.add_development_dependency("racc", "> 1.4.10")
6565
s.add_development_dependency("kpeg")
66-
s.add_development_dependency("minitest", "~> 4")
66+
s.add_development_dependency("minitest", "~> 5")
6767
end

test/minitest_helper.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22
begin
3-
gem 'minitest', '~> 4.0' unless defined?(Test::Unit)
3+
gem 'minitest', '~> 5.0'
44
rescue NoMethodError, Gem::LoadError
55
# for ruby tests
66
end
@@ -29,7 +29,7 @@
2929
# * <code>@pwd</code> containing the current working directory
3030
# * FileUtils, pp, Tempfile, Dir.tmpdir and StringIO
3131

32-
class RDoc::TestCase < MiniTest::Unit::TestCase
32+
class RDoc::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase)
3333

3434
##
3535
# Abstract test-case setup

test/xref_test_case.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22
ENV['RDOC_TEST'] = 'yes'
33

4-
require 'rdoc'
4+
require 'minitest_helper'
55
require File.expand_path '../xref_data', __FILE__
66

77
class XrefTestCase < RDoc::TestCase

0 commit comments

Comments
 (0)