diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-07 08:08:56 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-07 08:08:56 +0000 |
commit | c02174354e6e963b0375fb8faf0b6045ec27a43f (patch) | |
tree | ef02f7a13b4a0b47fa7622d360178d9c2adaa177 /spec/bundler/install | |
parent | 15c977803d3e54045ed34d25d56eb11706c0db68 (diff) |
Follow up r60970 for bundler's examples.
r60970 break Gemfile.lock format with file protocol after bundle
install/update. I addd hostname to these examples.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/bundler/install')
-rw-r--r-- | spec/bundler/install/gemfile/gemspec_spec.rb | 14 | ||||
-rw-r--r-- | spec/bundler/install/gemfile/sources_spec.rb | 20 | ||||
-rw-r--r-- | spec/bundler/install/gems/flex_spec.rb | 10 | ||||
-rw-r--r-- | spec/bundler/install/gems/mirror_spec.rb | 12 |
4 files changed, 28 insertions, 28 deletions
diff --git a/spec/bundler/install/gemfile/gemspec_spec.rb b/spec/bundler/install/gemfile/gemspec_spec.rb index 1dc016ed23..86cd2d8f3f 100644 --- a/spec/bundler/install/gemfile/gemspec_spec.rb +++ b/spec/bundler/install/gemfile/gemspec_spec.rb @@ -426,7 +426,7 @@ RSpec.describe "bundle install from an existing gemspec" do %w[ruby jruby].each do |platform| simulate_platform(platform) do install_gemfile <<-G - source "file://#{gem_repo2}" + source "file://localhost#{gem_repo2}" gemspec G end @@ -450,7 +450,7 @@ RSpec.describe "bundle install from an existing gemspec" do platform_specific GEM - remote: file:#{gem_repo2}/ + remote: file://localhost#{gem_repo2}/ specs: platform_specific (1.0) platform_specific (1.0-java) @@ -480,7 +480,7 @@ RSpec.describe "bundle install from an existing gemspec" do foo (1.0) GEM - remote: file:#{gem_repo2}/ + remote: file://localhost#{gem_repo2}/ specs: platform_specific (1.0) platform_specific (1.0-java) @@ -512,7 +512,7 @@ RSpec.describe "bundle install from an existing gemspec" do foo (1.0) GEM - remote: file:#{gem_repo2}/ + remote: file://localhost#{gem_repo2}/ specs: indirect_platform_specific (1.0) platform_specific @@ -545,7 +545,7 @@ RSpec.describe "bundle install from an existing gemspec" do expect(the_bundle).to include_gems "foo 1.0", "platform_specific 1.0 RUBY" expect(lockfile).to eq strip_whitespace(<<-L) GEM - remote: file:#{gem_repo2}/ + remote: file://localhost#{gem_repo2}/ specs: platform_specific (1.0) platform_specific (1.0-java) @@ -576,7 +576,7 @@ RSpec.describe "bundle install from an existing gemspec" do expect(the_bundle).to include_gems "foo 1.0", "platform_specific 1.0 RUBY" expect(lockfile).to eq strip_whitespace(<<-L) GEM - remote: file:#{gem_repo2}/ + remote: file://localhost#{gem_repo2}/ specs: platform_specific (1.0) platform_specific (1.0-java) @@ -608,7 +608,7 @@ RSpec.describe "bundle install from an existing gemspec" do expect(the_bundle).to include_gems "foo 1.0", "indirect_platform_specific 1.0", "platform_specific 1.0 RUBY" expect(lockfile).to eq strip_whitespace(<<-L) GEM - remote: file:#{gem_repo2}/ + remote: file://localhost#{gem_repo2}/ specs: indirect_platform_specific (1.0) platform_specific diff --git a/spec/bundler/install/gemfile/sources_spec.rb b/spec/bundler/install/gemfile/sources_spec.rb index 0b837f87a1..1a4e87514f 100644 --- a/spec/bundler/install/gemfile/sources_spec.rb +++ b/spec/bundler/install/gemfile/sources_spec.rb @@ -20,8 +20,8 @@ RSpec.describe "bundle install with gems on multiple sources" do before do gemfile <<-G - source "file://#{gem_repo3}" - source "file://#{gem_repo1}" + source "file://localhost#{gem_repo3}" + source "file://localhost#{gem_repo1}" gem "rack-obama" gem "rack" G @@ -33,7 +33,7 @@ RSpec.describe "bundle install with gems on multiple sources" do expect(out).to have_major_deprecation a_string_including("Your Gemfile contains multiple primary sources.") expect(out).to include("Warning: the gem 'rack' was found in multiple sources.") - expect(out).to include("Installed from: file:#{gem_repo1}") + expect(out).to include("Installed from: file://localhost#{gem_repo1}") expect(the_bundle).to include_gems("rack-obama 1.0.0", "rack 1.0.0", :source => "remote1") end @@ -50,8 +50,8 @@ RSpec.describe "bundle install with gems on multiple sources" do before do gemfile <<-G - source "file://#{gem_repo3}" - source "file://#{gem_repo1}" + source "file://localhost#{gem_repo3}" + source "file://localhost#{gem_repo1}" gem "rack-obama" gem "rack", "1.0.0" # force it to install the working version in repo1 G @@ -63,7 +63,7 @@ RSpec.describe "bundle install with gems on multiple sources" do expect(out).to have_major_deprecation a_string_including("Your Gemfile contains multiple primary sources.") expect(out).to include("Warning: the gem 'rack' was found in multiple sources.") - expect(out).to include("Installed from: file:#{gem_repo1}") + expect(out).to include("Installed from: file://localhost#{gem_repo1}") expect(the_bundle).to include_gems("rack-obama 1.0.0", "rack 1.0.0", :source => "remote1") end end @@ -240,9 +240,9 @@ RSpec.describe "bundle install with gems on multiple sources" do context "and in yet another source" do before do gemfile <<-G - source "file://#{gem_repo1}" - source "file://#{gem_repo2}" - source "file://#{gem_repo3}" do + source "file://localhost#{gem_repo1}" + source "file://localhost#{gem_repo2}" + source "file://localhost#{gem_repo3}" do gem "depends_on_rack" end G @@ -253,7 +253,7 @@ RSpec.describe "bundle install with gems on multiple sources" do bundle :install expect(out).to have_major_deprecation a_string_including("Your Gemfile contains multiple primary sources.") expect(out).to include("Warning: the gem 'rack' was found in multiple sources.") - expect(out).to include("Installed from: file:#{gem_repo2}") + expect(out).to include("Installed from: file://localhost#{gem_repo2}") expect(the_bundle).to include_gems("depends_on_rack 1.0.1", "rack 1.0.0") end end diff --git a/spec/bundler/install/gems/flex_spec.rb b/spec/bundler/install/gems/flex_spec.rb index f6af806154..f8b40f8e4e 100644 --- a/spec/bundler/install/gems/flex_spec.rb +++ b/spec/bundler/install/gems/flex_spec.rb @@ -247,19 +247,19 @@ RSpec.describe "bundle flex_install" do it "updates the lockfile", :bundler => "< 2" do build_repo2 install_gemfile! <<-G - source "file://#{gem_repo1}" + source "file://localhost#{gem_repo1}" gem "rack" G install_gemfile! <<-G - source "file://#{gem_repo1}" - source "file://#{gem_repo2}" + source "file://localhost#{gem_repo1}" + source "file://localhost#{gem_repo2}" gem "rack" G lockfile_should_be <<-L GEM - remote: file:#{gem_repo1}/ - remote: file:#{gem_repo2}/ + remote: file://localhost#{gem_repo1}/ + remote: file://localhost#{gem_repo2}/ specs: rack (1.0.0) diff --git a/spec/bundler/install/gems/mirror_spec.rb b/spec/bundler/install/gems/mirror_spec.rb index a8516a28c3..89302615f1 100644 --- a/spec/bundler/install/gems/mirror_spec.rb +++ b/spec/bundler/install/gems/mirror_spec.rb @@ -4,7 +4,7 @@ RSpec.describe "bundle install with a mirror configured" do describe "when the mirror does not match the gem source" do before :each do gemfile <<-G - source "file://#{gem_repo1}" + source "file://localhost#{gem_repo1}" gem "rack" G @@ -13,7 +13,7 @@ RSpec.describe "bundle install with a mirror configured" do it "installs from the normal location" do bundle :install - expect(out).to include("Fetching source index from file:#{gem_repo1}") + expect(out).to include("Fetching source index from file://localhost#{gem_repo1}") expect(the_bundle).to include_gems "rack 1.0" end end @@ -22,17 +22,17 @@ RSpec.describe "bundle install with a mirror configured" do before :each do gemfile <<-G # This source is bogus and doesn't have the gem we're looking for - source "file://#{gem_repo2}" + source "file://localhost#{gem_repo2}" gem "rack" G - bundle "config --local mirror.file://#{gem_repo2} file://#{gem_repo1}" + bundle "config --local mirror.file://localhost#{gem_repo2} file://localhost#{gem_repo1}" end it "installs the gem from the mirror" do bundle :install - expect(out).to include("Fetching source index from file:#{gem_repo1}") - expect(out).not_to include("Fetching source index from file:#{gem_repo2}") + expect(out).to include("Fetching source index from file://localhost#{gem_repo1}") + expect(out).not_to include("Fetching source index from file://localhost#{gem_repo2}") expect(the_bundle).to include_gems "rack 1.0" end end |