Skip to content

Commit 89243ee

Browse files
committed
Drop minitest 4 support
minitest 6 was just released, and minitest 5 was released over 12 years ago. It's unlikely there are any minitest 4 users that need updated versions of m. Remove BUNDLE_GEMFILE usage in test_bench.rb while here.
1 parent 4f4657b commit 89243ee

7 files changed

Lines changed: 7 additions & 118 deletions

File tree

README.md

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,7 @@ CONTRIBUTING
124124

125125
You can run all the tests with:
126126

127-
bundle exec rake tests
128-
129-
You can also run tests selectively. For minitest 4 run:
130-
131-
bundle exec rake test:minitest4
132-
133-
and the ones for minitest 5 or 6 with:
134-
135-
bundle exec rake test:minitest
136-
127+
bundle exec rake test
137128

138129
LICENSE
139130
=======

lib/m/frameworks.rb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ def self.minitest5?
1616
minitest_version_major == "5"
1717
end
1818

19-
def self.minitest4?
20-
minitest_version_major == "4"
21-
end
22-
2319
def self.test_unit?
2420
defined?(Test::Unit)
2521
end
@@ -33,8 +29,6 @@ def framework_runner
3329
Runners::Minitest6.new
3430
elsif minitest5?
3531
Runners::Minitest5.new
36-
elsif minitest4?
37-
Runners::Minitest4.new
3832
elsif test_unit?
3933
Runners::TestUnit.new
4034
else
@@ -52,10 +46,6 @@ def minitest5?
5246
self.class.minitest5?
5347
end
5448

55-
def minitest4?
56-
self.class.minitest4?
57-
end
58-
5949
def test_unit?
6050
self.class.test_unit?
6151
end

test/bench.rb

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,19 @@
1010
`bundle exec #{RbConfig.ruby} -Ilib ./bin/m test/examples/empty_example_test.rb 2>/dev/null`
1111
end
1212

13-
bench.report("running m on an entire file with minitest4") do
14-
`BUNDLE_GEMFILE=gemfiles/minitest4.gemfile bundle exec #{RbConfig.ruby} -Ilib ./bin/m test/examples/minitest_4_example_test.rb 2>/dev/null`
15-
end
16-
1713
bench.report("running m on an entire file with minitest") do
18-
`BUNDLE_GEMFILE=gemfiles/minitest.gemfile bundle exec #{RbConfig.ruby} -Ilib ./bin/m test/examples/minitest_5_or_6_example_test.rb 2>/dev/null`
14+
`bundle exec #{RbConfig.ruby} -Ilib ./bin/m test/examples/minitest_5_or_6_example_test.rb 2>/dev/null`
1915
end
2016

2117
bench.report("running m on an entire file with test-unit gem") do
22-
`BUNDLE_GEMFILE=gemfiles/test_unit_gem.gemfile bundle exec #{RbConfig.ruby} -Ilib ./bin/m test/examples/test_unit_example_test.rb 2>/dev/null`
23-
end
24-
25-
bench.report("running m on a specific test with minitest4") do
26-
`BUNDLE_GEMFILE=gemfiles/minitest4.gemfile bundle exec #{RbConfig.ruby} -Ilib ./bin/m test/examples/minitest_4_example_test.rb:19 2>/dev/null`
18+
`bundle exec #{RbConfig.ruby} -Ilib ./bin/m test/examples/test_unit_example_test.rb 2>/dev/null`
2719
end
2820

2921
bench.report("running m on a specific test with minitest") do
30-
`BUNDLE_GEMFILE=gemfiles/minitest.gemfile bundle exec #{RbConfig.ruby} -Ilib ./bin/m test/examples/minitest_5_or_6_example_test.rb:19 2>/dev/null`
22+
`bundle exec #{RbConfig.ruby} -Ilib ./bin/m test/examples/minitest_5_or_6_example_test.rb:19 2>/dev/null`
3123
end
3224

3325
bench.report("running m on a specific test with test-unit gem") do
34-
`BUNDLE_GEMFILE=gemfiles/test_unit_gem.gemfile bundle exec #{RbConfig.ruby} -Ilib ./bin/m test/examples/test_unit_example_test.rb:15 2>/dev/null`
26+
`bundle exec #{RbConfig.ruby} -Ilib ./bin/m test/examples/test_unit_example_test.rb:15 2>/dev/null`
3527
end
3628
end

test/examples/minitest_4_example_test.rb

Lines changed: 0 additions & 34 deletions
This file was deleted.

test/examples/minitest_example_test.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ def will_it_blend?
1010
end
1111
end
1212

13-
TestClass = M::Frameworks.minitest4? ? MiniTest::Unit::TestCase : Minitest::Test
14-
15-
class TestMeme < TestClass
13+
class TestMeme < Minitest::Test
1614
def setup
1715
@meme = Meme.new
1816
end

test/minitest_4_test.rb

Lines changed: 0 additions & 44 deletions
This file was deleted.

test/test_helper.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,8 @@ def try_loading gem
4545
class MTest < Test::Unit::TestCase
4646
include ::Testable
4747
end
48-
elsif M::Frameworks.minitest5? || M::Frameworks.minitest6?
49-
class MTest < Minitest::Test
50-
include ::Testable
51-
end
5248
else
53-
class MTest < MiniTest::Unit::TestCase
49+
class MTest < Minitest::Test
5450
include ::Testable
5551
end
5652
end

0 commit comments

Comments
 (0)