diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-05-06 18:06:21 +0200 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-08-03 09:29:55 +0900 |
commit | c3ddd47ce7b546530e2241b0ea6a96817977886a (patch) | |
tree | 46515c479773d7add25773b536009e096ee9fa78 /spec/bundler/plugins/source | |
parent | d8d5e16305ee071f7cf16980788cabcc44799c2e (diff) |
[bundler/bundler] Normalize file:// handling in specs
https://github.com/bundler/bundler/commit/5946d62ad0
Diffstat (limited to 'spec/bundler/plugins/source')
-rw-r--r-- | spec/bundler/plugins/source/example_spec.rb | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/spec/bundler/plugins/source/example_spec.rb b/spec/bundler/plugins/source/example_spec.rb index bc076c06bf..93b61b850a 100644 --- a/spec/bundler/plugins/source/example_spec.rb +++ b/spec/bundler/plugins/source/example_spec.rb @@ -52,7 +52,7 @@ RSpec.describe "real source plugins" do build_lib "a-path-gem" gemfile <<-G - source "file://localhost#{gem_repo2}" # plugin source + source "#{file_uri_for(gem_repo2)}" # plugin source source "#{lib_path("a-path-gem-1.0")}", :type => :mpath do gem "a-path-gem" end @@ -78,7 +78,7 @@ RSpec.describe "real source plugins" do a-path-gem (1.0) GEM - remote: file://localhost#{gem_repo2}/ + remote: #{file_uri_for(gem_repo2)}/ specs: PLATFORMS @@ -103,7 +103,7 @@ RSpec.describe "real source plugins" do a-path-gem (1.0) GEM - remote: file://localhost#{gem_repo2}/ + remote: #{file_uri_for(gem_repo2)}/ specs: PLATFORMS @@ -131,7 +131,7 @@ RSpec.describe "real source plugins" do end install_gemfile <<-G - source "file://#{gem_repo2}" # plugin source + source "#{file_uri_for(gem_repo2)}" # plugin source source "#{lib_path("gem-with-bin-1.0")}", :type => :mpath do gem "gem-with-bin" end @@ -186,7 +186,7 @@ RSpec.describe "real source plugins" do a-path-gem (1.0) GEM - remote: file:#{gem_repo2}/ + remote: #{file_uri_for(gem_repo2)}/ specs: PLATFORMS @@ -346,8 +346,8 @@ RSpec.describe "real source plugins" do build_git "ma-gitp-gem" gemfile <<-G - source "file://localhost#{gem_repo2}" # plugin source - source "file://#{lib_path("ma-gitp-gem-1.0")}", :type => :gitp do + source "#{file_uri_for(gem_repo2)}" # plugin source + source "#{file_uri_for(lib_path("ma-gitp-gem-1.0"))}", :type => :gitp do gem "ma-gitp-gem" end G @@ -365,14 +365,14 @@ RSpec.describe "real source plugins" do lockfile_should_be <<-G PLUGIN SOURCE - remote: file://#{lib_path("ma-gitp-gem-1.0")} + remote: #{file_uri_for(lib_path("ma-gitp-gem-1.0"))} type: gitp revision: #{revision} specs: ma-gitp-gem (1.0) GEM - remote: file://localhost#{gem_repo2}/ + remote: #{file_uri_for(gem_repo2)}/ specs: PLATFORMS @@ -392,14 +392,14 @@ RSpec.describe "real source plugins" do lockfile_should_be <<-G PLUGIN SOURCE - remote: file://#{lib_path("ma-gitp-gem-1.0")} + remote: #{file_uri_for(lib_path("ma-gitp-gem-1.0"))} type: gitp revision: #{revision} specs: ma-gitp-gem (1.0) GEM - remote: file://localhost#{gem_repo2}/ + remote: #{file_uri_for(gem_repo2)}/ specs: PLATFORMS @@ -418,14 +418,14 @@ RSpec.describe "real source plugins" do revision = revision_for(lib_path("ma-gitp-gem-1.0")) lockfile <<-G PLUGIN SOURCE - remote: file://#{lib_path("ma-gitp-gem-1.0")} + remote: #{file_uri_for(lib_path("ma-gitp-gem-1.0"))} type: gitp revision: #{revision} specs: ma-gitp-gem (1.0) GEM - remote: file:#{gem_repo2}/ + remote: #{file_uri_for(gem_repo2)}/ specs: PLATFORMS @@ -469,8 +469,8 @@ RSpec.describe "real source plugins" do it "updates the deps on change in gemfile" do update_git "ma-gitp-gem", "1.1", :path => lib_path("ma-gitp-gem-1.0"), :gemspec => true gemfile <<-G - source "file://#{gem_repo2}" # plugin source - source "file://#{lib_path("ma-gitp-gem-1.0")}", :type => :gitp do + source "#{file_uri_for(gem_repo2)}" # plugin source + source "#{file_uri_for(lib_path("ma-gitp-gem-1.0"))}", :type => :gitp do gem "ma-gitp-gem", "1.1" end G @@ -486,7 +486,7 @@ RSpec.describe "real source plugins" do ref = git.ref_for("master", 11) install_gemfile <<-G - source "file://#{gem_repo2}" # plugin source + source "#{file_uri_for(gem_repo2)}" # plugin source source '#{lib_path("foo-1.0")}', :type => :gitp do gem "foo" end |