summaryrefslogtreecommitdiff
path: root/spec/bundler/install/gems
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-07 08:08:56 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-07 08:08:56 +0000
commitc02174354e6e963b0375fb8faf0b6045ec27a43f (patch)
treeef02f7a13b4a0b47fa7622d360178d9c2adaa177 /spec/bundler/install/gems
parent15c977803d3e54045ed34d25d56eb11706c0db68 (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/gems')
-rw-r--r--spec/bundler/install/gems/flex_spec.rb10
-rw-r--r--spec/bundler/install/gems/mirror_spec.rb12
2 files changed, 11 insertions, 11 deletions
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