Skip to content

Commit

Permalink
Merge pull request #51011 from rails/revert-50978-pin_minitest_521
Browse files Browse the repository at this point in the history
Revert "Pin minitest version to 5.21"
  • Loading branch information
rafaelfranca committed May 17, 2024
2 parents 161d98d + 6ec2384 commit 4964049
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"
gemspec

gem "minitest", ">= 5.15.0", "< 5.22.0"
gem "minitest", ">= 5.15.0"

# We need a newish Rake since Active Job sets its test tasks' descriptions.
gem "rake", ">= 13"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ PATH
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1, < 5.22.0)
minitest (>= 5.1)
tzinfo (~> 2.0, >= 2.0.5)
rails (8.0.0.alpha)
actioncable (= 8.0.0.alpha)
Expand Down Expand Up @@ -644,7 +644,7 @@ DEPENDENCIES
libxml-ruby
listen (~> 3.3)
mdl (!= 0.13.0)
minitest (>= 5.15.0, < 5.22.0)
minitest (>= 5.15.0)
minitest-bisect
minitest-ci
minitest-retry
Expand Down
2 changes: 1 addition & 1 deletion activesupport/activesupport.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Gem::Specification.new do |s|
s.add_dependency "tzinfo", "~> 2.0", ">= 2.0.5"
s.add_dependency "concurrent-ruby", "~> 1.0", ">= 1.0.2"
s.add_dependency "connection_pool", ">= 2.2.5"
s.add_dependency "minitest", ">= 5.1", "< 5.22.0"
s.add_dependency "minitest", ">= 5.1"
s.add_dependency "base64"
s.add_dependency "drb"
s.add_dependency "bigdecimal"
Expand Down
14 changes: 7 additions & 7 deletions railties/test/commands/test_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,23 @@ class Rails::Command::TestTest < ActiveSupport::TestCase

test "test command with name option skips test:prepare task" do
assert_skips_prepare_task do
run_test_command("test", "-n", "test_some_code")
run_test_command("test", "-n", "test_some_code", allow_failure: true)
end

assert_skips_prepare_task do
run_test_command("test", "-n", "/some_code/")
run_test_command("test", "-n", "/some_code/", allow_failure: true)
end

assert_skips_prepare_task do
run_test_command("test", "-n", "some code")
run_test_command("test", "-n", "some code", allow_failure: true)
end

assert_skips_prepare_task do
run_test_command("test", "--name", "test_some_code")
run_test_command("test", "--name", "test_some_code", allow_failure: true)
end

assert_skips_prepare_task do
run_test_command("test", "--name=test_some_code")
run_test_command("test", "--name=test_some_code", allow_failure: true)
end
end

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

test "test:all with name option skips test:prepare task" do
assert_skips_prepare_task do
run_test_command("test:all", "-n", "test_some_code")
run_test_command("test:all", "-n", "test_some_code", allow_failure: true)
end
end

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

test "test:* with name option skips test:prepare task" do
assert_skips_prepare_task do
run_test_command("test:models", "-n", "test_some_code")
run_test_command("test:models", "-n", "test_some_code", allow_failure: true)
end
end

Expand Down

0 comments on commit 4964049

Please sign in to comment.