summaryrefslogtreecommitdiff
path: root/spec/bundler/commands/lock_spec.rb
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-05-06 18:06:21 +0200
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2019-08-03 09:29:55 +0900
commitc3ddd47ce7b546530e2241b0ea6a96817977886a (patch)
tree46515c479773d7add25773b536009e096ee9fa78 /spec/bundler/commands/lock_spec.rb
parentd8d5e16305ee071f7cf16980788cabcc44799c2e (diff)
[bundler/bundler] Normalize file:// handling in specs
https://github.com/bundler/bundler/commit/5946d62ad0
Diffstat (limited to 'spec/bundler/commands/lock_spec.rb')
-rw-r--r--spec/bundler/commands/lock_spec.rb28
1 files changed, 14 insertions, 14 deletions
diff --git a/spec/bundler/commands/lock_spec.rb b/spec/bundler/commands/lock_spec.rb
index 7aaf5c178e..5735b6c060 100644
--- a/spec/bundler/commands/lock_spec.rb
+++ b/spec/bundler/commands/lock_spec.rb
@@ -13,15 +13,15 @@ RSpec.describe "bundle lock" do
before :each do
gemfile <<-G
- source "file://localhost#{repo}"
+ source "#{file_uri_for(repo)}"
gem "rails"
gem "with_license"
gem "foo"
G
- @lockfile = strip_lockfile(normalize_uri_file(<<-L))
+ @lockfile = strip_lockfile(<<-L)
GEM
- remote: file://localhost#{repo}/
+ remote: #{file_uri_for(repo)}/
specs:
actionmailer (2.3.2)
activesupport (= 2.3.2)
@@ -91,12 +91,12 @@ RSpec.describe "bundle lock" do
it "works with --gemfile flag" do
create_file "CustomGemfile", <<-G
- source "file://localhost#{repo}"
+ source "#{file_uri_for(repo)}"
gem "foo"
G
- lockfile = strip_lockfile(normalize_uri_file(<<-L))
+ lockfile = strip_lockfile(<<-L)
GEM
- remote: file://localhost#{repo}/
+ remote: #{file_uri_for(repo)}/
specs:
foo (1.0)
@@ -151,7 +151,7 @@ RSpec.describe "bundle lock" do
it "can lock without downloading gems" do
gemfile <<-G
- source "file://#{gem_repo1}"
+ source "#{file_uri_for(gem_repo1)}"
gem "thin"
gem "rack_middleware", :group => "test"
@@ -182,7 +182,7 @@ RSpec.describe "bundle lock" do
# establish a lockfile set to 1.4.3
install_gemfile <<-G
- source "file://#{gem_repo4}"
+ source "#{file_uri_for(gem_repo4)}"
gem 'foo', '1.4.3'
gem 'bar', '2.0.3'
gem 'qux', '1.0.0'
@@ -191,7 +191,7 @@ RSpec.describe "bundle lock" do
# remove 1.4.3 requirement and bar altogether
# to setup update specs below
gemfile <<-G
- source "file://#{gem_repo4}"
+ source "#{file_uri_for(gem_repo4)}"
gem 'foo'
gem 'qux'
G
@@ -276,7 +276,7 @@ RSpec.describe "bundle lock" do
end
gemfile <<-G
- source "file://localhost#{gem_repo4}"
+ source "#{file_uri_for(gem_repo4)}"
gem "mixlib-shellout"
gem "gssapi"
@@ -284,9 +284,9 @@ RSpec.describe "bundle lock" do
simulate_platform(mingw) { bundle! :lock }
- expect(the_bundle.lockfile).to read_as(normalize_uri_file(strip_whitespace(<<-G)))
+ expect(the_bundle.lockfile).to read_as(strip_whitespace(<<-G))
GEM
- remote: file://localhost#{gem_repo4}/
+ remote: #{file_uri_for(gem_repo4)}/
specs:
ffi (1.9.14-x86-mingw32)
gssapi (1.2.0)
@@ -309,9 +309,9 @@ RSpec.describe "bundle lock" do
simulate_platform(rb) { bundle! :lock }
- expect(the_bundle.lockfile).to read_as(normalize_uri_file(strip_whitespace(<<-G)))
+ expect(the_bundle.lockfile).to read_as(strip_whitespace(<<-G))
GEM
- remote: file://localhost#{gem_repo4}/
+ remote: #{file_uri_for(gem_repo4)}/
specs:
ffi (1.9.14)
ffi (1.9.14-x86-mingw32)