diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-05-05 19:00:47 +0200 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-08-03 09:29:55 +0900 |
commit | e111f38f34ea6b48446a0c29e142ccf44cfff282 (patch) | |
tree | 386cf93787490bf315980e586ff20d4d4b06ce98 /spec/bundler/support | |
parent | c3ddd47ce7b546530e2241b0ea6a96817977886a (diff) | |
download | ruby-e111f38f34ea6b48446a0c29e142ccf44cfff282.tar.gz |
[bundler/bundler] Fix file:// handling under Windows
Windows paths do not start with a slash, so we add an extra slash to
separate the host from the path in file:// urls. Otherwise "D:" is
parsed as the host segment in the URI.
The path for those URLs now starts with "/", so we ignore that leading
character when using the URI's path.
This reduces Windows CI spec failures from 429 to 355.
https://github.com/bundler/bundler/commit/1b7e274cbc
Diffstat (limited to 'spec/bundler/support')
-rw-r--r-- | spec/bundler/support/path.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/bundler/support/path.rb b/spec/bundler/support/path.rb index 28682a1f25..ca05ef5e3b 100644 --- a/spec/bundler/support/path.rb +++ b/spec/bundler/support/path.rb @@ -64,10 +64,11 @@ module Spec def file_uri_for(path) protocol = "file://" + root = Gem.win_platform? ? "/" : "" - return protocol + "localhost" + path.to_s if RUBY_VERSION < "2.5" + return protocol + "localhost" + root + path.to_s if RUBY_VERSION < "2.5" - protocol + path.to_s + protocol + root + path.to_s end def gem_repo1(*args) |