From 9ec026730f2b5ad81b73b3f03a739616d2011e4c Mon Sep 17 00:00:00 2001
From: Yury Semikhatsky <yurys@chromium.org>
Date: Tue, 4 Aug 2020 17:26:42 -0700
Subject: [PATCH] chore(test): use pathToFileURL (#3292)

---
 test/capabilities.spec.js | 6 ++----
 test/navigation.spec.js   | 5 -----
 test/page-history.spec.js | 5 +----
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/test/capabilities.spec.js b/test/capabilities.spec.js
index 9a362770ea..605cfdbb04 100644
--- a/test/capabilities.spec.js
+++ b/test/capabilities.spec.js
@@ -15,6 +15,7 @@
  */
 
 const path = require('path');
+const url = require('url');
 
 const {FFOX, CHROMIUM, WEBKIT, WIN, LINUX, ASSETS_DIR} = testOptions;
 
@@ -58,10 +59,7 @@ it.fail(WEBKIT && WIN)('should play video', async({page}) => {
   const absolutePath = path.join(ASSETS_DIR, fileName);
   // Our test server doesn't support range requests required to play on Mac,
   // so we load the page using a file url.
-  const url = WIN
-      ? 'file:///' + absolutePath.replace(/\\/g, '/')
-      : 'file://' + absolutePath;
-  await page.goto(url);
+  await page.goto(url.pathToFileURL(absolutePath).href);
   await page.$eval('video', v => v.play());
   await page.$eval('video', v => v.pause());
 });
diff --git a/test/navigation.spec.js b/test/navigation.spec.js
index 94de13d15a..63461aa9f0 100644
--- a/test/navigation.spec.js
+++ b/test/navigation.spec.js
@@ -15,11 +15,6 @@
  * limitations under the License.
  */
 
-const utils = require('./utils');
-const path = require('path');
-const url = require('url');
-const {FFOX, CHROMIUM, WEBKIT, ASSETS_DIR, MAC, WIN} = testOptions;
-
 it('should work with _blank target', async({page, server}) => {
   server.setRoute('/empty.html', (req, res) => {
     res.end(`<a href="${server.EMPTY_PAGE}" target="_blank">Click me</a>`);
diff --git a/test/page-history.spec.js b/test/page-history.spec.js
index d7189a6855..b6306fffdc 100644
--- a/test/page-history.spec.js
+++ b/test/page-history.spec.js
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-const utils = require('./utils');
 const path = require('path');
 const url = require('url');
 const {FFOX, CHROMIUM, WEBKIT, ASSETS_DIR, MAC, WIN} = testOptions;
@@ -56,9 +55,7 @@ it('page.goBack should work with HistoryAPI', async({page, server}) => {
 
 it.fail(WEBKIT && MAC)('page.goBack should work for file urls', async ({page, server}) => {
   // WebKit embedder fails to go back/forward to the file url.
-  const url1 = WIN
-      ? 'file:///' + path.join(ASSETS_DIR, 'empty.html').replace(/\\/g, '/')
-      : 'file://' + path.join(ASSETS_DIR, 'empty.html');
+  const url1 = url.pathToFileURL(path.join(ASSETS_DIR, 'empty.html')).href;
   const url2 = server.EMPTY_PAGE;
   await page.goto(url1);
   await page.setContent(`<a href='${url2}'>url2</a>`);