Skip to content

Use Minitest 5 #606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ end

Rake::TestTask.new(:test) do |t|
t.libs << "test"
t.libs << "lib"
t.verbose = true
t.test_files = FileList['test/**/test_*.rb']
end

Expand Down
2 changes: 0 additions & 2 deletions lib/rdoc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,6 @@ def self.load_yaml

autoload :RDoc, 'rdoc/rdoc'

autoload :TestCase, 'rdoc/test_case'

autoload :CrossReference, 'rdoc/cross_reference'
autoload :ERBIO, 'rdoc/erbio'
autoload :ERBPartial, 'rdoc/erb_partial'
Expand Down
2 changes: 1 addition & 1 deletion rdoc.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,5 @@ RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentat
s.add_development_dependency("rake")
s.add_development_dependency("racc", "> 1.4.10")
s.add_development_dependency("kpeg")
s.add_development_dependency("minitest", "~> 4")
s.add_development_dependency("minitest", "~> 5")
end
4 changes: 2 additions & 2 deletions test/minitest_helper.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true
begin
gem 'minitest', '~> 4.0' unless defined?(Test::Unit)
gem 'minitest', '~> 5.0'
rescue NoMethodError, Gem::LoadError
# for ruby tests
end
Expand Down Expand Up @@ -29,7 +29,7 @@
# * <code>@pwd</code> containing the current working directory
# * FileUtils, pp, Tempfile, Dir.tmpdir and StringIO

class RDoc::TestCase < MiniTest::Unit::TestCase
class RDoc::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase)

##
# Abstract test-case setup
Expand Down
2 changes: 1 addition & 1 deletion test/xref_test_case.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true
ENV['RDOC_TEST'] = 'yes'

require 'rdoc'
require 'minitest_helper'
require File.expand_path '../xref_data', __FILE__

class XrefTestCase < RDoc::TestCase
Expand Down