Merge #7161

7161: Fix file URIs on Windows r=hsbt a=deivid-rodriguez

### What was the end-user problem that led to this PR?

The problem was that file:// URIs were not properly handled on Windows, and those are heavily used by our specs.

### What was your diagnosis of the problem?

My diagnosis was that Windows paths do not start with a slash, so we need to 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.

As a consequence of that change, we also need to strip that leading character when using the path segment for those URIs, so that it's a valid file path on Windows.

This change reduces Windows CI spec failures from 429 to 355.

In order to apply this fix for all file URI's in tests, I extracted a helper method and searched and replaced all file:// ocurrences with the method. The diff is big because of that, but I think it works fine.

Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>

1 files changed, 1 insertions, 10 deletions

diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index cf76a84b7c..922555ff60 100644
--- a/spec/support/helpers.rb
+++ b/spec/support/helpers.rb
@@ -279,7 +279,7 @@ module Spec
       if contents.nil?
         File.open("Gemfile.lock", "r", &:read)
       else
-        create_file("Gemfile.lock", normalize_uri_file(contents), *args)
+        create_file("Gemfile.lock", contents, *args)
       end
     end
 
@@ -289,15 +289,6 @@ module Spec
       str.gsub(/^#{spaces}/, "")
     end
 
-    def normalize_uri_file(str)
-      # URI::File of Ruby 2.6 normalize localhost variable with file protocol.
-      if defined?(URI::File)
-        str.gsub(%r{file:\/\/localhost}, "file://")
-      else
-        str
-      end
-    end
-
     def install_gemfile(*args)
       gemfile(*args)
       opts = args.last.is_a?(Hash) ? args.last : {}