1 files changed, 585 insertions, 365 deletions
@@ -20,23 +20,23 @@ RSpec.describe "bundle install with gems on multiple sources" do
 before do
 gemfile <<-G
- source "#{file_uri_for(gem_repo3)}"
- source "#{file_uri_for(gem_repo1)}"
 gem "rack-obama"
 gem "rack"
 G
 end
 it "warns about ambiguous gems, but installs anyway, prioritizing sources last to first", :bundler => "< 3" do
- bundle :install
 expect(err).to include("Warning: the gem 'rack' was found in multiple sources.")
- expect(err).to include("Installed from: #{file_uri_for(gem_repo1)}")
 expect(the_bundle).to include_gems("rack-obama 1.0.0", "rack 1.0.0", :source => "remote1")
 end
 it "fails", :bundler => "3" do
- bundle :instal, :raise_on_error => false
 expect(err).to include("Each source after the first must include a block")
 expect(exitstatus).to eq(4)
 end
@@ -47,22 +47,22 @@ RSpec.describe "bundle install with gems on multiple sources" do
 before do
 gemfile <<-G
- source "#{file_uri_for(gem_repo3)}"
- source "#{file_uri_for(gem_repo1)}"
 gem "rack-obama"
 gem "rack", "1.0.0" # force it to install the working version in repo1
 G
 end
 it "warns about ambiguous gems, but installs anyway", :bundler => "< 3" do
- bundle :install
 expect(err).to include("Warning: the gem 'rack' was found in multiple sources.")
- expect(err).to include("Installed from: #{file_uri_for(gem_repo1)}")
 expect(the_bundle).to include_gems("rack-obama 1.0.0", "rack 1.0.0", :source => "remote1")
 end
 it "fails", :bundler => "3" do
- bundle :install, :raise_on_error => false
 expect(err).to include("Each source after the first must include a block")
 expect(exitstatus).to eq(4)
 end
@@ -85,8 +85,8 @@ RSpec.describe "bundle install with gems on multiple sources" do
 end
 gemfile <<-G
- source "#{file_uri_for(gem_repo3)}"
- source "#{file_uri_for(gem_repo1)}" do
 gem "thin" # comes first to test name sorting
 gem "rack"
 end
@@ -95,20 +95,20 @@ RSpec.describe "bundle install with gems on multiple sources" do
 end
 it "installs the gems without any warning" do
- bundle :install
 expect(err).not_to include("Warning")
 expect(the_bundle).to include_gems("rack-obama 1.0.0")
 expect(the_bundle).to include_gems("rack 1.0.0", :source => "remote1")
 end
 it "can cache and deploy" do
- bundle :cache
 expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
 expect(bundled_app("vendor/cache/rack-obama-1.0.gem")).to exist
 bundle "config set --local deployment true"
- bundle :install
 expect(the_bundle).to include_gems("rack-obama 1.0.0", "rack 1.0.0")
 end
@@ -128,10 +128,10 @@ RSpec.describe "bundle install with gems on multiple sources" do
 end
 end
- install_gemfile <<-G
- source "#{file_uri_for(gem_repo3)}"
 gem "rack-obama" # should come from repo3!
- gem "rack", :source => "#{file_uri_for(gem_repo1)}"
 G
 end
@@ -155,8 +155,8 @@ RSpec.describe "bundle install with gems on multiple sources" do
 end
 gemfile <<-G
- source "#{file_uri_for(gem_repo2)}"
- source "#{file_uri_for(gem_repo3)}" do
 gem "depends_on_rack"
 end
 G
@@ -168,7 +168,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
 end
 it "installs from the same source without any warning" do
- bundle :install
 expect(err).not_to include("Warning")
 expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0", :source => "remote3")
 end
@@ -185,7 +185,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
 end
 it "installs from the same source without any warning" do
- bundle :install
 expect(err).not_to include("Warning: the gem 'rack' was found in multiple sources.")
 expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0", :source => "remote3")
@@ -193,7 +193,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
 # In https://.com/bundler/bundler/issues/3585 this failed
 # when there is already a lock file, and the gems are missing, so try again
 system_gems []
- bundle :install
 expect(err).not_to include("Warning: the gem 'rack' was found in multiple sources.")
 expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0", :source => "remote3")
@@ -218,9 +218,9 @@ RSpec.describe "bundle install with gems on multiple sources" do
 context "and not in any other sources" do
 before do
- install_gemfile <<-G
- source "#{file_uri_for(gem_repo2)}"
- source "#{file_uri_for(gem_repo3)}" do
 gem "depends_on_rack"
 end
 G
@@ -235,23 +235,49 @@ RSpec.describe "bundle install with gems on multiple sources" do
 context "and in yet another source" do
 before do
 gemfile <<-G
- source "#{file_uri_for(gem_repo1)}"
- source "#{file_uri_for(gem_repo2)}"
- source "#{file_uri_for(gem_repo3)}" do
 gem "depends_on_rack"
 end
 G
 end
 it "installs from the other source and warns about ambiguous gems", :bundler => "< 3" do
- bundle :install
 expect(err).to include("Warning: the gem 'rack' was found in multiple sources.")
- expect(err).to include("Installed from: #{file_uri_for(gem_repo2)}")
 expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0")
 end
 it "fails", :bundler => "3" do
- bundle :install, :raise_on_error => false
 expect(err).to include("Each source after the first must include a block")
 expect(exitstatus).to eq(4)
 end
@@ -267,16 +293,16 @@ RSpec.describe "bundle install with gems on multiple sources" do
 end
 gemfile <<-G
- source "#{file_uri_for(gem_repo3)}" # contains depends_on_rack
- source "#{file_uri_for(gem_repo2)}" # contains broken rack
 gem "depends_on_rack" # installed from gem_repo3
- gem "rack", :source => "#{file_uri_for(gem_repo1)}"
 G
 end
 it "installs the dependency from the pinned source without warning", :bundler => "< 3" do
- bundle :install
 expect(err).not_to include("Warning: the gem 'rack' was found in multiple sources.")
 expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0")
@@ -284,14 +310,14 @@ RSpec.describe "bundle install with gems on multiple sources" do
 # In https://.com/rubygems/bundler/issues/3585 this failed
 # when there is already a lock file, and the gems are missing, so try again
 system_gems []
- bundle :install
 expect(err).not_to include("Warning: the gem 'rack' was found in multiple sources.")
 expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0")
 end
 it "fails", :bundler => "3" do
- bundle :install, :raise_on_error => false
 expect(err).to include("Each source after the first must include a block")
 expect(exitstatus).to eq(4)
 end
@@ -308,360 +334,508 @@ RSpec.describe "bundle install with gems on multiple sources" do
 end
 gemfile <<-G
- source "#{file_uri_for(gem_repo2)}"
 gem "private_gem_1"
- source "#{file_uri_for(gem_repo3)}" do
 gem "private_gem_2"
 end
 G
 end
 it "fails" do
- bundle :install, :raise_on_error => false
- expect(err).to include("Could not find gem 'private_gem_1' in rubygems repository #{file_uri_for(gem_repo2)}/ or installed locally.")
 expect(err).to include("The source does not contain any versions of 'private_gem_1'")
 end
 end
 context "when a top-level gem has an indirect dependency" do
- context "when disable_multisource is set" do
- before do
- bundle "config set disable_multisource true"
 end
 before do
- build_repo gem_repo2 do
- build_gem "depends_on_rack", "1.0.1" do |s|
- s.add_dependency "rack"
- end
 end
- build_repo gem_repo3 do
- build_gem "unrelated_gem", "1.0.0"
 end
- gemfile <<-G
- source "#{file_uri_for(gem_repo2)}"
- gem "depends_on_rack"
- source "#{file_uri_for(gem_repo3)}" do
- gem "unrelated_gem"
 end
- G
 end
- context "and the dependency is only in the top-level source" do
- before do
- update_repo gem_repo2 do
- build_gem "rack", "1.0.0"
- end
 end
- it "installs all gems without warning" do
- bundle :install
- expect(err).not_to include("Warning")
- expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0", "unrelated_gem 1.0.0")
 end
 end
- context "and the dependency is only in a pinned source" do
- before do
- update_repo gem_repo3 do
- build_gem "rack", "1.0.0" do |s|
- s.write "lib/rack.rb", "RACK = 'FAIL'"
- end
- end
 end
- it "does not find the dependency" do
- bundle :install, :raise_on_error => false
- expect(err).to include("Could not find gem 'rack', which is required by gem 'depends_on_rack', in any of the relevant sources")
 end
 end
- context "and the dependency is in both the top-level and a pinned source" do
- before do
- update_repo gem_repo2 do
- build_gem "rack", "1.0.0"
- end
- update_repo gem_repo3 do
- build_gem "rack", "1.0.0" do |s|
- s.write "lib/rack.rb", "RACK = 'FAIL'"
- end
- end
- end
- it "installs the dependency from the top-level source without warning" do
- bundle :install
- expect(err).not_to include("Warning")
- expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0", "unrelated_gem 1.0.0")
 end
 end
 end
- context "when the lockfile has aggregated rubygems sources and newer versions of dependencies are available" do
 before do
- build_repo gem_repo2 do
- build_gem "activesupport", "6.0.3.4" do |s|
- s.add_dependency "concurrent-ruby", "~> 1.0", ">= 1.0.2"
- s.add_dependency "i18n", ">= 0.7", "< 2"
- s.add_dependency "minitest", "~> 5.1"
- s.add_dependency "tzinfo", "~> 1.1"
- s.add_dependency "zeitwerk", "~> 2.2", ">= 2.2.2"
 end
- build_gem "activesupport", "6.1.2.1" do |s|
- s.add_dependency "concurrent-ruby", "~> 1.0", ">= 1.0.2"
- s.add_dependency "i18n", ">= 1.6", "< 2"
- s.add_dependency "minitest", ">= 5.1"
- s.add_dependency "tzinfo", "~> 2.0"
- s.add_dependency "zeitwerk", "~> 2.3"
- end
- build_gem "concurrent-ruby", "1.1.8"
- build_gem "concurrent-ruby", "1.1.9"
- build_gem "connection_pool", "2.2.3"
- build_gem "i18n", "1.8.9" do |s|
- s.add_dependency "concurrent-ruby", "~> 1.0"
- end
- build_gem "minitest", "5.14.3"
- build_gem "rack", "2.2.3"
- build_gem "redis", "4.2.5"
- build_gem "sidekiq", "6.1.3" do |s|
- s.add_dependency "connection_pool", ">= 2.2.2"
- s.add_dependency "rack", "~> 2.0"
- s.add_dependency "redis", ">= 4.2.0"
- end
- build_gem "thread_safe", "0.3.6"
- build_gem "tzinfo", "1.2.9" do |s|
- s.add_dependency "thread_safe", "~> 0.1"
- end
- build_gem "tzinfo", "2.0.4" do |s|
- s.add_dependency "concurrent-ruby", "~> 1.0"
- end
- build_gem "zeitwerk", "2.4.2"
 end
- build_repo gem_repo3 do
- build_gem "sidekiq-pro", "5.2.1" do |s|
- s.add_dependency "connection_pool", ">= 2.2.3"
- s.add_dependency "sidekiq", ">= 6.1.0"
- end
 end
- gemfile <<-G
- # frozen_string_literal: true
- source "#{file_uri_for(gem_repo2)}"
- gem "activesupport"
- source "#{file_uri_for(gem_repo3)}" do
- gem "sidekiq-pro"
- end
- G
- lockfile <<~L
- GEM
- remote: #{file_uri_for(gem_repo2)}/
- remote: #{file_uri_for(gem_repo3)}/
- specs:
- activesupport (6.0.3.4)
- concurrent-ruby (~> 1.0, >= 1.0.2)
- i18n (>= 0.7, < 2)
- minitest (~> 5.1)
- tzinfo (~> 1.1)
- zeitwerk (~> 2.2, >= 2.2.2)
- concurrent-ruby (1.1.8)
- connection_pool (2.2.3)
- i18n (1.8.9)
- concurrent-ruby (~> 1.0)
- minitest (5.14.3)
- rack (2.2.3)
- redis (4.2.5)
- sidekiq (6.1.3)
- connection_pool (>= 2.2.2)
- rack (~> 2.0)
- redis (>= 4.2.0)
- sidekiq-pro (5.2.1)
- connection_pool (>= 2.2.3)
- sidekiq (>= 6.1.0)
- thread_safe (0.3.6)
- tzinfo (1.2.9)
- thread_safe (~> 0.1)
- zeitwerk (2.4.2)
- PLATFORMS
- #{specific_local_platform}
- DEPENDENCIES
- activesupport
- sidekiq-pro!
- BUNDLED WITH
- #{Bundler::VERSION}
- L
- end
- it "does not install newer versions or generate lockfile changes when running bundle install, and warns", :bundler => "< 3" do
- initial_lockfile = lockfile
- bundle :install
- expect(err).to include("Your lockfile contains a single rubygems source section with multiple remotes, which is insecure.")
- expect(the_bundle).to include_gems("activesupport 6.0.3.4")
- expect(the_bundle).not_to include_gems("activesupport 6.1.2.1")
- expect(the_bundle).to include_gems("tzinfo 1.2.9")
- expect(the_bundle).not_to include_gems("tzinfo 2.0.4")
- expect(the_bundle).to include_gems("concurrent-ruby 1.1.8")
- expect(the_bundle).not_to include_gems("concurrent-ruby 1.1.9")
- expect(lockfile).to eq(initial_lockfile)
- end
- it "fails when running bundle install", :bundler => "3" do
- initial_lockfile = lockfile
- bundle :install, :raise_on_error => false
- expect(err).to include("Your lockfile contains a single rubygems source section with multiple remotes, which is insecure.")
- expect(lockfile).to eq(initial_lockfile)
- end
- it "splits sections and upgrades gems when running bundle update, and doesn't warn" do
- bundle "update --all"
- expect(err).to be_empty
- expect(the_bundle).not_to include_gems("activesupport 6.0.3.4")
- expect(the_bundle).to include_gems("activesupport 6.1.2.1")
- expect(the_bundle).not_to include_gems("tzinfo 1.2.9")
- expect(the_bundle).to include_gems("tzinfo 2.0.4")
- expect(the_bundle).not_to include_gems("concurrent-ruby 1.1.8")
- expect(the_bundle).to include_gems("concurrent-ruby 1.1.9")
- expect(lockfile).to eq <<~L
- GEM
- remote: #{file_uri_for(gem_repo2)}/
- specs:
- activesupport (6.1.2.1)
- concurrent-ruby (~> 1.0, >= 1.0.2)
- i18n (>= 1.6, < 2)
- minitest (>= 5.1)
- tzinfo (~> 2.0)
- zeitwerk (~> 2.3)
- concurrent-ruby (1.1.9)
- connection_pool (2.2.3)
- i18n (1.8.9)
- concurrent-ruby (~> 1.0)
- minitest (5.14.3)
- rack (2.2.3)
- redis (4.2.5)
- sidekiq (6.1.3)
- connection_pool (>= 2.2.2)
- rack (~> 2.0)
- redis (>= 4.2.0)
- tzinfo (2.0.4)
- concurrent-ruby (~> 1.0)
- zeitwerk (2.4.2)
- GEM
- remote: #{file_uri_for(gem_repo3)}/
- specs:
- sidekiq-pro (5.2.1)
- connection_pool (>= 2.2.3)
- sidekiq (>= 6.1.0)
- PLATFORMS
- #{specific_local_platform}
- DEPENDENCIES
- activesupport
- sidekiq-pro!
- BUNDLED WITH
- #{Bundler::VERSION}
- L
- end
- it "it keeps the current lockfile format and upgrades the requested gem when running bundle update with an argument, and warns", :bundler => "< 3" do
- bundle "update concurrent-ruby"
- expect(err).to include("Your lockfile contains a single rubygems source section with multiple remotes, which is insecure.")
- expect(the_bundle).to include_gems("activesupport 6.0.3.4")
- expect(the_bundle).not_to include_gems("activesupport 6.1.2.1")
- expect(the_bundle).to include_gems("tzinfo 1.2.9")
- expect(the_bundle).not_to include_gems("tzinfo 2.0.4")
- expect(the_bundle).to include_gems("concurrent-ruby 1.1.9")
- expect(the_bundle).not_to include_gems("concurrent-ruby 1.1.8")
- expect(lockfile).to eq <<~L
- GEM
- remote: #{file_uri_for(gem_repo2)}/
- remote: #{file_uri_for(gem_repo3)}/
- specs:
- activesupport (6.0.3.4)
- concurrent-ruby (~> 1.0, >= 1.0.2)
- i18n (>= 0.7, < 2)
- minitest (~> 5.1)
- tzinfo (~> 1.1)
- zeitwerk (~> 2.2, >= 2.2.2)
- concurrent-ruby (1.1.9)
- connection_pool (2.2.3)
- i18n (1.8.9)
- concurrent-ruby (~> 1.0)
- minitest (5.14.3)
- rack (2.2.3)
- redis (4.2.5)
- sidekiq (6.1.3)
- connection_pool (>= 2.2.2)
- rack (~> 2.0)
- redis (>= 4.2.0)
- sidekiq-pro (5.2.1)
- connection_pool (>= 2.2.3)
- sidekiq (>= 6.1.0)
- thread_safe (0.3.6)
- tzinfo (1.2.9)
- thread_safe (~> 0.1)
- zeitwerk (2.4.2)
- PLATFORMS
- #{specific_local_platform}
- DEPENDENCIES
- activesupport
- sidekiq-pro!
- BUNDLED WITH
- #{Bundler::VERSION}
- L
- end
- it "fails when running bundle update with an argument", :bundler => "3" do
- initial_lockfile = lockfile
- bundle "update concurrent-ruby", :raise_on_error => false
- expect(err).to include("Your lockfile contains a single rubygems source section with multiple remotes, which is insecure.")
- expect(lockfile).to eq(initial_lockfile)
- end
 end
 end
- context "when a top-level gem has an indirect dependency present in the default source, but with a different version from the one resolved", :bundler => "< 3" do
 before do
 build_lib "activesupport", "7.0.0.alpha", :path => lib_path("rails/activesupport")
 build_lib "rails", "7.0.0.alpha", :path => lib_path("rails") do |s|
@@ -677,7 +851,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
 end
 gemfile <<-G
- source "#{file_uri_for(gem_repo2)}"
 gemspec :path => "#{lib_path("rails")}"
@@ -686,7 +860,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
 end
 it "installs all gems without warning" do
- bundle :install
 expect(err).not_to include("Warning")
 expect(the_bundle).to include_gems("activesupport 7.0.0.alpha", "rails 7.0.0.alpha")
 expect(the_bundle).to include_gems("activesupport 7.0.0.alpha", :source => "path@#{lib_path("rails/activesupport")}")
@@ -711,9 +885,9 @@ RSpec.describe "bundle install with gems on multiple sources" do
 end
 gemfile <<-G
- source "#{file_uri_for(gem_repo2)}"
- source "#{file_uri_for(gem_repo3)}" do
 gem "handsoap"
 end
@@ -724,14 +898,14 @@ RSpec.describe "bundle install with gems on multiple sources" do
 it "installs from the default source without any warnings or errors and generates a proper lockfile" do
 expected_lockfile = <<~L
 GEM
- remote: #{file_uri_for(gem_repo2)}/
 specs:
 nokogiri (1.11.1)
 racca (~> 1.4)
 racca (1.5.2)
 GEM
- remote: #{file_uri_for(gem_repo3)}/
 specs:
 handsoap (0.2.5.5)
 nokogiri (>= 1.2.3)
@@ -747,7 +921,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
 #{Bundler::VERSION}
 L
- bundle "install --verbose"
 expect(err).not_to include("Warning")
 expect(the_bundle).to include_gems("handsoap 0.2.5.5", "nokogiri 1.11.1", "racca 1.5.2")
 expect(the_bundle).to include_gems("handsoap 0.2.5.5", :source => "remote3")
@@ -756,7 +930,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
 # Even if the gems are already installed
 FileUtils.rm bundled_app_lock
- bundle "install --verbose"
 expect(err).not_to include("Warning")
 expect(the_bundle).to include_gems("handsoap 0.2.5.5", "nokogiri 1.11.1", "racca 1.5.2")
 expect(the_bundle).to include_gems("handsoap 0.2.5.5", :source => "remote3")
@@ -771,9 +945,9 @@ RSpec.describe "bundle install with gems on multiple sources" do
 build_gem "not_in_repo1", "1.0.0"
 end
- install_gemfile <<-G, :raise_on_error => false
- source "#{file_uri_for(gem_repo3)}"
- gem "not_in_repo1", :source => "#{file_uri_for(gem_repo1)}"
 G
 end
@@ -788,24 +962,24 @@ RSpec.describe "bundle install with gems on multiple sources" do
 lockfile <<-L
 GEM
- remote: #{file_uri_for(gem_repo1)}
 specs:
 GEM
- remote: #{file_uri_for(gem_repo3)}
 specs:
 rack (0.9.1)
 PLATFORMS
- ruby
 DEPENDENCIES
 rack!
 L
 gemfile <<-G
- source "#{file_uri_for(gem_repo1)}"
- source "#{file_uri_for(gem_repo3)}" do
 gem 'rack'
 end
 G
@@ -821,8 +995,8 @@ RSpec.describe "bundle install with gems on multiple sources" do
 let(:aggregate_gem_section_lockfile) do
 <<~L
 GEM
- remote: #{file_uri_for(gem_repo1)}/
- remote: #{file_uri_for(gem_repo3)}/
 specs:
 rack (0.9.1)
@@ -840,11 +1014,11 @@ RSpec.describe "bundle install with gems on multiple sources" do
 let(:split_gem_section_lockfile) do
 <<~L
 GEM
- remote: #{file_uri_for(gem_repo1)}/
 specs:
 GEM
- remote: #{file_uri_for(gem_repo3)}/
 specs:
 rack (0.9.1)
@@ -865,8 +1039,8 @@ RSpec.describe "bundle install with gems on multiple sources" do
 end
 gemfile <<-G
- source "#{file_uri_for(gem_repo1)}"
- source "#{file_uri_for(gem_repo3)}" do
 gem 'rack'
 end
 G
@@ -877,7 +1051,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
 it "installs the existing lockfile but prints a warning", :bundler => "< 3" do
 bundle "config set --local deployment true"
- bundle "install"
 expect(lockfile).to eq(aggregate_gem_section_lockfile)
 expect(err).to include("Your lockfile contains a single rubygems source section with multiple remotes, which is insecure.")
@@ -887,7 +1061,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
 it "refuses to install the existing lockfile and prints an error", :bundler => "3" do
 bundle "config set --local deployment true"
- bundle "install", :raise_on_error =>false
 expect(lockfile).to eq(aggregate_gem_section_lockfile)
 expect(err).to include("Your lockfile contains a single rubygems source section with multiple remotes, which is insecure.")
@@ -900,13 +1074,13 @@ RSpec.describe "bundle install with gems on multiple sources" do
 build_lib "foo"
 gemfile <<-G
- gem "rack", :source => "#{file_uri_for(gem_repo1)}"
 gem "foo", :path => "#{lib_path("foo-1.0")}"
 G
 end
 it "does not unlock the non-path gem after install" do
- bundle :install
 bundle %(exec ruby -e 'puts "OK"')
@@ -919,8 +1093,8 @@ RSpec.describe "bundle install with gems on multiple sources" do
 before do
 system_gems "rack-0.9.1"
- install_gemfile <<-G
- source "#{file_uri_for(gem_repo1)}"
 gem "rack" # should come from repo1!
 G
 end
@@ -941,14 +1115,14 @@ RSpec.describe "bundle install with gems on multiple sources" do
 # Installing this gemfile...
 gemfile <<-G
- source '#{file_uri_for(gem_repo1)}'
 gem 'rack'
- gem 'foo', '~> 0.1', :source => '#{file_uri_for(gem_repo4)}'
- gem 'bar', '~> 0.1', :source => '#{file_uri_for(gem_repo4)}'
 G
 bundle "config set --local path ../gems/system"
- bundle :install
 # And then we add some new versions...
 update_repo4 do
@@ -959,11 +1133,11 @@ RSpec.describe "bundle install with gems on multiple sources" do
 it "allows them to be unlocked separately" do
 # And install this gemfile, updating only foo.
- install_gemfile <<-G
- source '#{file_uri_for(gem_repo1)}'
 gem 'rack'
- gem 'foo', '~> 0.2', :source => '#{file_uri_for(gem_repo4)}'
- gem 'bar', '~> 0.1', :source => '#{file_uri_for(gem_repo4)}'
 G
 # It should update foo to 0.2, but not the (locked) bar 0.1
@@ -983,11 +1157,11 @@ RSpec.describe "bundle install with gems on multiple sources" do
 build_git "git1"
 build_git "git2"
- install_gemfile <<-G
- source "#{file_uri_for(gem_repo1)}"
 gem "rails"
- source "#{file_uri_for(gem_repo3)}" do
 gem "rack"
 end
@@ -999,7 +1173,7 @@ RSpec.describe "bundle install with gems on multiple sources" do
 end
 it "does not re-resolve" do
- bundle :install, :verbose => true
 expect(out).to include("using resolution from the lockfile")
 expect(out).not_to include("re-resolving dependencies")
 end
@@ -1008,27 +1182,24 @@ RSpec.describe "bundle install with gems on multiple sources" do
 context "when a gem is installed to system gems" do
 before do
- install_gemfile <<-G
- source "#{file_uri_for(gem_repo1)}"
 gem "rack"
 G
 end
 context "and the gemfile changes" do
 it "is still able to find that gem from remote sources" do
- source_uri = file_uri_for(gem_repo1)
- second_uri = file_uri_for(gem_repo4)
-
 build_repo4 do
 build_gem "rack", "2.0.1.1.forked"
 build_gem "thor", "0.19.1.1.forked"
 end
 # When this gemfile is installed...
- install_gemfile <<-G
- source "#{source_uri}"
- source "#{second_uri}" do
 gem "rack", "2.0.1.1.forked"
 gem "thor"
 end
@@ -1037,9 +1208,9 @@ RSpec.describe "bundle install with gems on multiple sources" do
 # Then we change the Gemfile by adding a version to thor
 gemfile <<-G
- source "#{source_uri}"
- source "#{second_uri}" do
 gem "rack", "2.0.1.1.forked"
 gem "thor", "0.19.1.1.forked"
 end
@@ -1047,15 +1218,15 @@ RSpec.describe "bundle install with gems on multiple sources" do
 G
 # But we should still be able to find rack 2.0.1.1.forked and install it
- bundle :install
 end
 end
 end
 describe "source changed to one containing a higher version of a dependency" do
 before do
- install_gemfile <<-G
- source "#{file_uri_for(gem_repo1)}"
 gem "rack"
 G
@@ -1072,8 +1243,8 @@ RSpec.describe "bundle install with gems on multiple sources" do
 s.add_dependency "bar", "=1.0.0"
 end
- install_gemfile <<-G
- source "#{file_uri_for(gem_repo2)}"
 gem "rack"
 gemspec :path => "#{tmp.join("gemspec_test")}"
 G
@@ -1093,10 +1264,10 @@ RSpec.describe "bundle install with gems on multiple sources" do
 build_gem "example", "1.0.2"
 end
- install_gemfile <<-G
- source "#{file_uri_for(gem_repo4)}"
- gem "example", :source => "#{file_uri_for(gem_repo2)}"
 G
 bundle "info example"
@@ -1104,12 +1275,60 @@ RSpec.describe "bundle install with gems on multiple sources" do
 system_gems "example-1.0.2", :path => default_bundle_path, :gem_repo => gem_repo4
- bundle "update example --verbose"
 expect(out).not_to include("Using example 1.0.2")
 expect(out).to include("Using example 0.1.0")
 end
- context "when a gem is available from multiple ambiguous sources", :bundler => "3" do
 it "raises, suggesting a source block" do
 build_repo4 do
 build_gem "depends_on_rack" do |s|
@@ -1118,18 +1337,19 @@ RSpec.describe "bundle install with gems on multiple sources" do
 build_gem "rack"
 end
- install_gemfile <<-G, :raise_on_error => false
- source "#{file_uri_for(gem_repo4)}"
- source "#{file_uri_for(gem_repo1)}" do
 gem "thin"
 end
- gem "depends_on_rack"
 G
 expect(last_command).to be_failure
 expect(err).to eq strip_whitespace(<<-EOS).strip
 The gem 'rack' was found in multiple relevant sources.
- * rubygems repository #{file_uri_for(gem_repo1)}/ or installed locally
- * rubygems repository #{file_uri_for(gem_repo4)}/ or installed locally
 You must add this gem to the source block for the source you wish it to be installed from.
 EOS
 expect(the_bundle).not_to be_locked