From 29dd834343a264b5d95d8f7eea73673ca0ea979d Mon Sep 17 00:00:00 2001
From: Taketo Takashima <t.taketo1113@gmail.com>
Date: Tue, 25 Mar 2025 01:15:16 +0900
Subject: [PATCH] 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
---
 .github/workflows/ci.yml | 13 ++++++++++++-
 test/test_case.rb        |  4 ++--
 test/test_helper.rb      |  2 +-
 whenever.gemspec         |  4 ++--
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5c9a5fa7..ab3e5d3a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,18 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ruby-version: [ '2.4.6', '2.5.5', '2.6.3', 'jruby-9.2.16.0']
+        ruby-version: [ '2.4', '2.5', '2.6', '2.7', '3.0', '3.0', '3.2', '3.3', '3.4', 'jruby-9', 'jruby-10']
+        # CRuby < 2.6 does not support macos-arm64, so test those on amd64 instead
+        exclude:
+          - os: macos-latest
+            ruby-version: '2.4'
+          - os: macos-latest
+            ruby-version: '2.5'
+        include:
+          - os: macos-13
+            ruby-version: '2.4'
+          - os: macos-13
+            ruby-version: '2.5'
     steps:
       - uses: actions/checkout@v4
         name: Set up Ruby ${{ matrix.ruby-version }}
diff --git a/test/test_case.rb b/test/test_case.rb
index bc4d820c..c3c075d3 100644
--- a/test/test_case.rb
+++ b/test/test_case.rb
@@ -2,10 +2,10 @@ module Whenever
   require 'minitest/autorun'
   begin
     # 2.0.0
-    class TestCase < MiniTest::Test; end
+    class TestCase < Minitest::Test; end
   rescue NameError
     # 1.9.3
-    class TestCase < MiniTest::Unit::TestCase; end
+    class TestCase < Minitest::Unit::TestCase; end
   end
 
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 77e3492f..c1a97af5 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,6 +1,6 @@
 require 'whenever'
 require 'test_case'
-require 'mocha/setup'
+require 'mocha/minitest'
 
 module Whenever::TestHelpers
   protected
diff --git a/whenever.gemspec b/whenever.gemspec
index 6ae7db1d..331cde9b 100644
--- a/whenever.gemspec
+++ b/whenever.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler"
   s.add_development_dependency "rake"
-  s.add_development_dependency "mocha", ">= 0.9.5", "< 2.0.0"
-  s.add_development_dependency "minitest", "<= 5.2.0"
+  s.add_development_dependency "mocha"
+  s.add_development_dependency "minitest"
   s.add_development_dependency "appraisal"
 end