Skip to content

Commit 2f9965a

Browse files
committed
Support minitest 6 where possible, pin < 6 elsewhere
Minitest 6 extracted minitest/mock into a separate gem (minitest-mock), which breaks tests that require "minitest/mock". - Rails 7.0, 7.1: pin minitest < 6 (these Rails versions don't constrain minitest themselves) - Rails 7.2: already pins minitest < 6 in its own gemspec (rails/rails@6ea60702) - Rails 8.0, 8.1, root Gemfile: use minitest 6 with minitest-mock gem
1 parent 68bb8c5 commit 2f9965a

7 files changed

Lines changed: 16 additions & 0 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@ jobs:
1414
- "7.1"
1515
- "7.2"
1616
- "8.0"
17+
- "8.1"
1718
exclude:
1819
- ruby-version: "3.1"
1920
rails-version: "8.0"
21+
- ruby-version: "3.1"
22+
rails-version: "8.1"
2023
fail-fast: false
2124
env:
2225
BUNDLE_GEMFILE: gemfiles/Gemfile.rails-${{ matrix.rails-version }}

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ source "https://rubygems.org"
33
gemspec
44

55
gem "rails", ">= 7.0.1"
6+
gem "minitest-mock"
67
gem "rake"
78
gem "debug"

gemfiles/Gemfile.rails-7.0

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ source "https://rubygems.org"
33
gemspec path: ".."
44

55
gem "rails", github: "rails/rails", branch: "7-0-stable"
6+
gem "minitest", "< 6"
67
gem "rake"
78
gem "debug"

gemfiles/Gemfile.rails-7.1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ source "https://rubygems.org"
33
gemspec path: ".."
44

55
gem "rails", "~> 7.1.0"
6+
gem "minitest", "< 6"
67
gem "rake"
78
gem "debug"

gemfiles/Gemfile.rails-7.2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ source "https://rubygems.org"
33
gemspec path: ".."
44

55
gem "rails", "~> 7.2.0"
6+
gem "minitest-mock"
67
gem "rake"
78
gem "debug"

gemfiles/Gemfile.rails-8.0

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ source "https://rubygems.org"
33
gemspec path: ".."
44

55
gem "rails", "~> 8.0"
6+
gem "minitest-mock"
67
gem "rake"
78
gem "debug"

gemfiles/Gemfile.rails-8.1

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
source "https://rubygems.org"
2+
3+
gemspec path: ".."
4+
5+
gem "rails", "~> 8.1"
6+
gem "minitest-mock"
7+
gem "rake"
8+
gem "debug"

0 commit comments

Comments
 (0)