Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundler/lib/bundler/cli/gem.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class CLI
class CLI::Gem
TEST_FRAMEWORK_VERSIONS = {
"rspec" => "3.0",
"minitest" => "5.16",
"minitest" => "6.0",
"test-unit" => "3.0",
}.freeze

Expand Down
9 changes: 6 additions & 3 deletions spec/commands/newgem_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -746,13 +746,14 @@ def create_temporary_dir(dir)
expect(ignore_paths).to include("spec/")
end

it "depends on a specific version of rspec in generated Gemfile" do
it "depends on a minimum version of rspec in generated Gemfile" do
allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
builder = Bundler::Dsl.new
builder.eval_gemfile(bundled_app("#{gem_name}/Gemfile"))
builder.dependencies
rspec_dep = builder.dependencies.find {|d| d.name == "rspec" }
expect(rspec_dep).not_to be_specific
expect(rspec_dep.requirement).to eq(Gem::Requirement.new([">= 3.0"]))
end
end

Expand Down Expand Up @@ -831,13 +832,14 @@ def create_temporary_dir(dir)
bundle "gem #{gem_name} --test=minitest"
end

it "depends on a specific version of minitest" do
it "depends on a minimum version of minitest" do
allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
builder = Bundler::Dsl.new
builder.eval_gemfile(bundled_app("#{gem_name}/Gemfile"))
builder.dependencies
minitest_dep = builder.dependencies.find {|d| d.name == "minitest" }
expect(minitest_dep).not_to be_specific
expect(minitest_dep.requirement).to eq(Gem::Requirement.new([">= 6.0"]))
end

it "builds spec skeleton" do
Expand Down Expand Up @@ -892,13 +894,14 @@ def create_temporary_dir(dir)
bundle "gem #{gem_name} --test=test-unit"
end

it "depends on a specific version of test-unit" do
it "depends on a minimum version of test-unit" do
allow(Bundler::SharedHelpers).to receive(:find_gemfile).and_return(bundled_app_gemfile)
builder = Bundler::Dsl.new
builder.eval_gemfile(bundled_app("#{gem_name}/Gemfile"))
builder.dependencies
test_unit_dep = builder.dependencies.find {|d| d.name == "test-unit" }
expect(test_unit_dep).not_to be_specific
expect(test_unit_dep.requirement).to eq(Gem::Requirement.new([">= 3.0"]))
end

it "builds spec skeleton" do
Expand Down
11 changes: 4 additions & 7 deletions tool/bundler/dev_gems.rb.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
GEM
remote: https://rubygems.org/
specs:
compact_index (0.15.0)
diff-lcs (1.6.2)
docile (1.4.1)
kramdown (2.5.2)
Expand Down Expand Up @@ -35,7 +34,7 @@ GEM
racc (1.8.1-java)
rake (13.4.2)
rake-compiler-dock (1.12.0)
rb_sys (0.9.127)
rb_sys (0.9.128)
rake-compiler-dock (= 1.12.0)
rexml (3.4.4)
ronn-ng (0.10.1)
Expand All @@ -56,8 +55,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.7)
rubygems-generate_index (1.1.3)
compact_index (~> 0.15.0)
rubygems-generate_index (1.2.0)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
Expand Down Expand Up @@ -102,7 +100,6 @@ DEPENDENCIES
turbo_tests (~> 2.2.3)

CHECKSUMS
compact_index (0.15.0) sha256=5c6c404afca8928a7d9f4dde9524f6e1610db17e675330803055db282da84a8b
diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e
kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa
Expand All @@ -124,15 +121,15 @@ CHECKSUMS
racc (1.8.1-java) sha256=54f2e6d1e1b91c154013277d986f52a90e5ececbe91465d29172e49342732b98
rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023
rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847
rb_sys (0.9.128) sha256=9ab81f4d6d4e1895de18762232362d1264475aa7035756b50441e442130538fd
rexml (3.4.4) sha256=19e0a2c3425dfbf2d4fc1189747bdb2f849b6c5e74180401b15734bc97b5d142
ronn-ng (0.10.1) sha256=4eeb0185c0fbfa889efed923b5b50e949cd869e7d82ac74138acd0c9c7165ec0
rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d
rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
rspec-mocks (3.13.8) sha256=086ad3d3d17533f4237643de0b5c42f04b66348c28bf6b9c2d3f4a3b01af1d47
rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
rubygems-generate_index (1.1.3) sha256=3571424322666598e9586a906485e1543b617f87644913eaf137d986a3393f5c
rubygems-generate_index (1.2.0) sha256=cb33b935545a38dba4ac1f20d391090d2bb017d0956537a8bbadc1fff23f0aab
simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5
simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246
simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428
Expand Down
2 changes: 1 addition & 1 deletion tool/bundler/rubocop_gems.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

gem "rubocop", ">= 1.52.1", "< 2"

gem "minitest", "~> 5.1"
gem "minitest", "~> 6.0"
gem "irb"
gem "rake"
gem "rake-compiler"
Expand Down
10 changes: 7 additions & 3 deletions tool/bundler/rubocop_gems.rb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ GEM
date (3.5.1)
date (3.5.1-java)
diff-lcs (1.6.2)
drb (2.2.3)
erb (6.0.4)
erb (6.0.4-java)
io-console (0.8.2)
Expand All @@ -19,7 +20,9 @@ GEM
json (2.19.4-java)
language_server-protocol (3.17.0.5)
lint_roller (1.1.0)
minitest (5.27.0)
minitest (6.0.6)
drb (~> 2.0)
prism (~> 1.5)
parallel (2.1.0)
parser (3.3.11.1)
ast (~> 2.4.1)
Expand Down Expand Up @@ -100,7 +103,7 @@ PLATFORMS

DEPENDENCIES
irb
minitest (~> 5.1)
minitest (~> 6.0)
rake
rake-compiler
rb_sys (>= 0.9.127)
Expand All @@ -113,6 +116,7 @@ CHECKSUMS
date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0
date (3.5.1-java) sha256=12e09477dc932afe45bf768cd362bf73026804e0db1e6c314186d6cd0bee3344
diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373
erb (6.0.4) sha256=38e3803694be357fe2bfe312487c74beaf9fb4e5beb3e22498952fe1645b95d9
erb (6.0.4-java) sha256=3014611d37917a20e14ea3ba71e06a8d581b71c073858d7796eeee45b01e8407
io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc
Expand All @@ -123,7 +127,7 @@ CHECKSUMS
json (2.19.4-java) sha256=f7f0fe701e2bef648497b0eb59422f5b453e5038cfbaf9cde09af20e22241efb
language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
minitest (5.27.0) sha256=2d3b17f8a36fe7801c1adcffdbc38233b938eb0b4966e97a6739055a45fa77d5
minitest (6.0.6) sha256=153ea36d1d987a62942382b61075745042a2b3123b1cd48f4c3675af9cc7d6f1
parallel (2.1.0) sha256=b35258865c2e31134c5ecb708beaaf6772adf9d5efae28e93e99260877b09356
parser (3.3.11.1) sha256=d17ace7aabe3e72c3cc94043714be27cc6f852f104d81aa284c2281aecc65d54
power_assert (3.0.1) sha256=8ce9876716cc74e863fcd4cdcdc52d792bd983598d1af3447083a3a9a4d34103
Expand Down
2 changes: 1 addition & 1 deletion tool/bundler/standard_gems.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

gem "standard", "~> 1.0"

gem "minitest", "~> 5.1"
gem "minitest", "~> 6.0"
gem "irb"
gem "rake"
gem "rake-compiler"
Expand Down
10 changes: 7 additions & 3 deletions tool/bundler/standard_gems.rb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ GEM
date (3.5.1)
date (3.5.1-java)
diff-lcs (1.6.2)
drb (2.2.3)
erb (6.0.4)
erb (6.0.4-java)
io-console (0.8.2)
Expand All @@ -19,7 +20,9 @@ GEM
json (2.19.4-java)
language_server-protocol (3.17.0.5)
lint_roller (1.1.0)
minitest (5.27.0)
minitest (6.0.6)
drb (~> 2.0)
prism (~> 1.5)
parallel (1.28.0)
parser (3.3.11.1)
ast (~> 2.4.1)
Expand Down Expand Up @@ -116,7 +119,7 @@ PLATFORMS

DEPENDENCIES
irb
minitest (~> 5.1)
minitest (~> 6.0)
rake
rake-compiler
rb_sys (>= 0.9.127)
Expand All @@ -129,6 +132,7 @@ CHECKSUMS
date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0
date (3.5.1-java) sha256=12e09477dc932afe45bf768cd362bf73026804e0db1e6c314186d6cd0bee3344
diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373
erb (6.0.4) sha256=38e3803694be357fe2bfe312487c74beaf9fb4e5beb3e22498952fe1645b95d9
erb (6.0.4-java) sha256=3014611d37917a20e14ea3ba71e06a8d581b71c073858d7796eeee45b01e8407
io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc
Expand All @@ -139,7 +143,7 @@ CHECKSUMS
json (2.19.4-java) sha256=f7f0fe701e2bef648497b0eb59422f5b453e5038cfbaf9cde09af20e22241efb
language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
minitest (5.27.0) sha256=2d3b17f8a36fe7801c1adcffdbc38233b938eb0b4966e97a6739055a45fa77d5
minitest (6.0.6) sha256=153ea36d1d987a62942382b61075745042a2b3123b1cd48f4c3675af9cc7d6f1
parallel (1.28.0) sha256=33e6de1484baf2524792d178b0913fc8eb94c628d6cfe45599ad4458c638c970
parser (3.3.11.1) sha256=d17ace7aabe3e72c3cc94043714be27cc6f852f104d81aa284c2281aecc65d54
power_assert (3.0.1) sha256=8ce9876716cc74e863fcd4cdcdc52d792bd983598d1af3447083a3a9a4d34103
Expand Down
Loading