Skip to content

Commit 29dd834

Browse files
committed
Add Ruby 2.7-3.4 to the CI matrix
Relax version constraints for 'mocha' and 'minitest' for development dependencies Fix incorrect casing of 'Minitest' in test case definition Use 'mocha/minitest' instead of 'mocha/setup' to address deprecation warning Update CI matrix to run Ruby 2.4/2.5 on macOS-13 (Intel), since macOS arm64 is unsupported Update jruby version for CI matrix
1 parent 96a8fad commit 29dd834

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,18 @@ jobs:
99
strategy:
1010
matrix:
1111
os: [ubuntu-latest, macos-latest]
12-
ruby-version: [ '2.4.6', '2.5.5', '2.6.3', 'jruby-9.2.16.0']
12+
ruby-version: [ '2.4', '2.5', '2.6', '2.7', '3.0', '3.0', '3.2', '3.3', '3.4', 'jruby-9', 'jruby-10']
13+
# CRuby < 2.6 does not support macos-arm64, so test those on amd64 instead
14+
exclude:
15+
- os: macos-latest
16+
ruby-version: '2.4'
17+
- os: macos-latest
18+
ruby-version: '2.5'
19+
include:
20+
- os: macos-13
21+
ruby-version: '2.4'
22+
- os: macos-13
23+
ruby-version: '2.5'
1324
steps:
1425
- uses: actions/checkout@v4
1526
name: Set up Ruby ${{ matrix.ruby-version }}

test/test_case.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ module Whenever
22
require 'minitest/autorun'
33
begin
44
# 2.0.0
5-
class TestCase < MiniTest::Test; end
5+
class TestCase < Minitest::Test; end
66
rescue NameError
77
# 1.9.3
8-
class TestCase < MiniTest::Unit::TestCase; end
8+
class TestCase < Minitest::Unit::TestCase; end
99
end
1010

1111

test/test_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'whenever'
22
require 'test_case'
3-
require 'mocha/setup'
3+
require 'mocha/minitest'
44

55
module Whenever::TestHelpers
66
protected

whenever.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
2222

2323
s.add_development_dependency "bundler"
2424
s.add_development_dependency "rake"
25-
s.add_development_dependency "mocha", ">= 0.9.5", "< 2.0.0"
26-
s.add_development_dependency "minitest", "<= 5.2.0"
25+
s.add_development_dependency "mocha"
26+
s.add_development_dependency "minitest"
2727
s.add_development_dependency "appraisal"
2828
end

0 commit comments

Comments
 (0)