From dd145563178a759a3b541c522bdf9fadc3048822 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Jan 2026 14:39:13 +0000 Subject: [PATCH 1/2] deps: update minitest requirement from ~> 5.10, != 5.10.2 to != 5.10.2, ~> 6.0 Updates the requirements on [minitest](https://github.com/minitest/minitest) to permit the latest version. Updates `minitest` to 6.0.1 - [Changelog](https://github.com/minitest/minitest/blob/master/History.rdoc) - [Commits](https://github.com/minitest/minitest/compare/v5.10.0...v6.0.1) --- updated-dependencies: - dependency-name: minitest dependency-version: 6.0.1 dependency-type: direct:development dependency-group: development-dependencies ... Signed-off-by: dependabot[bot] --- jsonapi-resources.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonapi-resources.gemspec b/jsonapi-resources.gemspec index c1401490..58d75373 100644 --- a/jsonapi-resources.gemspec +++ b/jsonapi-resources.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'bundler', '>= 1.17' spec.add_development_dependency 'rake' - spec.add_development_dependency 'minitest', '~> 5.10', '!= 5.10.2' + spec.add_development_dependency 'minitest', '!= 5.10.2', '~> 6.0' spec.add_development_dependency 'minitest-spec-rails' spec.add_development_dependency 'simplecov' spec.add_development_dependency 'pry' From e92576e87294ffa4cf57f0491a1cbc9051a1fca9 Mon Sep 17 00:00:00 2001 From: Koji Takao Date: Fri, 23 Jan 2026 18:22:14 +0900 Subject: [PATCH 2/2] Make minitest dependency permissive to support both 5.x and 6.0 - Change minitest constraint from '~> 6.0' to '>= 5.10', '< 7' This allows bundler to select minitest 5.x for Rails < 6.1 (which require minitest ~> 5.1) and minitest 6.x for Rails >= 6.1 - Add minitest-mock gem dependency Required for minitest 6.0 which extracted minitest/mock to separate gem - Remove Minitest 4 backward compatibility code The MiniTest:: namespace compatibility is no longer needed and was removed in minitest 6.0 This approach maintains compatibility with all supported Rails versions (5.1, 5.2, 6.0, 6.1, 7.0, 7.1, 7.2, 8.0, 8.1) while allowing the project to use the latest minitest 6.0 features when possible. Tested with Rails 6.1.7.10 and 7.0.10 - all tests pass. --- jsonapi-resources.gemspec | 3 ++- test/test_helper.rb | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/jsonapi-resources.gemspec b/jsonapi-resources.gemspec index 58d75373..1d35f95d 100644 --- a/jsonapi-resources.gemspec +++ b/jsonapi-resources.gemspec @@ -21,7 +21,8 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'bundler', '>= 1.17' spec.add_development_dependency 'rake' - spec.add_development_dependency 'minitest', '!= 5.10.2', '~> 6.0' + spec.add_development_dependency 'minitest', '>= 5.10', '!= 5.10.2', '< 7' + spec.add_development_dependency 'minitest-mock' spec.add_development_dependency 'minitest-spec-rails' spec.add_development_dependency 'simplecov' spec.add_development_dependency 'pry' diff --git a/test/test_helper.rb b/test/test_helper.rb index 7a1bb952..2ac27ee5 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -532,9 +532,6 @@ class CatResource < JSONAPI::Resource jsonapi_resources :people end -# Ensure backward compatibility with Minitest 4 -Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test) - class Minitest::Test include Helpers::Assertions include Helpers::ValueMatchers