Skip to content

Commit 4964049

Browse files
authored
Merge pull request rails#51011 from rails/revert-50978-pin_minitest_521
Revert "Pin minitest version to 5.21"
2 parents 161d98d + 6ec2384 commit 4964049

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44
gemspec
55

6-
gem "minitest", ">= 5.15.0", "< 5.22.0"
6+
gem "minitest", ">= 5.15.0"
77

88
# We need a newish Rake since Active Job sets its test tasks' descriptions.
99
gem "rake", ">= 13"

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ PATH
9393
connection_pool (>= 2.2.5)
9494
drb
9595
i18n (>= 1.6, < 2)
96-
minitest (>= 5.1, < 5.22.0)
96+
minitest (>= 5.1)
9797
tzinfo (~> 2.0, >= 2.0.5)
9898
rails (8.0.0.alpha)
9999
actioncable (= 8.0.0.alpha)
@@ -644,7 +644,7 @@ DEPENDENCIES
644644
libxml-ruby
645645
listen (~> 3.3)
646646
mdl (!= 0.13.0)
647-
minitest (>= 5.15.0, < 5.22.0)
647+
minitest (>= 5.15.0)
648648
minitest-bisect
649649
minitest-ci
650650
minitest-retry

activesupport/activesupport.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
3838
s.add_dependency "tzinfo", "~> 2.0", ">= 2.0.5"
3939
s.add_dependency "concurrent-ruby", "~> 1.0", ">= 1.0.2"
4040
s.add_dependency "connection_pool", ">= 2.2.5"
41-
s.add_dependency "minitest", ">= 5.1", "< 5.22.0"
41+
s.add_dependency "minitest", ">= 5.1"
4242
s.add_dependency "base64"
4343
s.add_dependency "drb"
4444
s.add_dependency "bigdecimal"

railties/test/commands/test_test.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,23 +41,23 @@ class Rails::Command::TestTest < ActiveSupport::TestCase
4141

4242
test "test command with name option skips test:prepare task" do
4343
assert_skips_prepare_task do
44-
run_test_command("test", "-n", "test_some_code")
44+
run_test_command("test", "-n", "test_some_code", allow_failure: true)
4545
end
4646

4747
assert_skips_prepare_task do
48-
run_test_command("test", "-n", "/some_code/")
48+
run_test_command("test", "-n", "/some_code/", allow_failure: true)
4949
end
5050

5151
assert_skips_prepare_task do
52-
run_test_command("test", "-n", "some code")
52+
run_test_command("test", "-n", "some code", allow_failure: true)
5353
end
5454

5555
assert_skips_prepare_task do
56-
run_test_command("test", "--name", "test_some_code")
56+
run_test_command("test", "--name", "test_some_code", allow_failure: true)
5757
end
5858

5959
assert_skips_prepare_task do
60-
run_test_command("test", "--name=test_some_code")
60+
run_test_command("test", "--name=test_some_code", allow_failure: true)
6161
end
6262
end
6363

@@ -74,7 +74,7 @@ class Rails::Command::TestTest < ActiveSupport::TestCase
7474

7575
test "test:all with name option skips test:prepare task" do
7676
assert_skips_prepare_task do
77-
run_test_command("test:all", "-n", "test_some_code")
77+
run_test_command("test:all", "-n", "test_some_code", allow_failure: true)
7878
end
7979
end
8080

@@ -86,7 +86,7 @@ class Rails::Command::TestTest < ActiveSupport::TestCase
8686

8787
test "test:* with name option skips test:prepare task" do
8888
assert_skips_prepare_task do
89-
run_test_command("test:models", "-n", "test_some_code")
89+
run_test_command("test:models", "-n", "test_some_code", allow_failure: true)
9090
end
9191
end
9292

0 commit comments

Comments
 (0)