squash: change to fileURL()

Author: LiviaMedeiros

test/common/tmpdir.js

@@ -29,7 +29,6 @@ const testRoot = process.env.NODE_TEST_DIR ?
 const tmpdirName = '.tmp.' +
   (process.env.TEST_SERIAL_ID || process.env.TEST_THREAD_ID || '0');
 const tmpPath = path.join(testRoot, tmpdirName);
-const tmpUrl = pathToFileURL(tmpPath + path.sep);
 
 let firstRefresh = true;
 function refresh(useSpawn = false) {
@@ -76,9 +75,16 @@ function hasEnoughSpace(size) {
   return bavail >= Math.ceil(size / bsize);
 }
 
+function fileURL(...paths) {
+  // When called without arguments, add explicit trailing slash
+  const fullPath = path.resolve(tmpPath + path.sep, ...paths);
+
+  return pathToFileURL(fullPath);
+}
+
 module.exports = {
+  fileURL,
+  hasEnoughSpace,
   path: tmpPath,
-  url: tmpUrl.href,
   refresh,
-  hasEnoughSpace,
 };

test/parallel/test-child-process-cwd.js

@@ -87,7 +87,7 @@ function testCwd(options, expectPidType, expectCode = 0, expectData) {
 testCwd({ cwd: tmpdir.path }, 'number', 0, tmpdir.path);
 const shouldExistDir = common.isWindows ? process.env.windir : '/dev';
 testCwd({ cwd: shouldExistDir }, 'number', 0, shouldExistDir);
-testCwd({ cwd: new URL(tmpdir.url) }, 'number', 0, tmpdir.path);
+testCwd({ cwd: tmpdir.fileURL() }, 'number', 0, tmpdir.path);
 
 // Spawn() shouldn't try to chdir() to invalid arg, so this should just work
 testCwd({ cwd: '' }, 'number');

test/parallel/test-fs-mkdtemp.js

@@ -40,26 +40,24 @@ function handler(err, folder) {
 
 // Test with URL object
 {
-  const urljoin = (base, path) => new URL(path, base);
-
-  const tmpFolder = fs.mkdtempSync(urljoin(tmpdir.url, 'foo.'));
+  const tmpFolder = fs.mkdtempSync(tmpdir.fileURL('foo.'));
 
   assert.strictEqual(path.basename(tmpFolder).length, 'foo.XXXXXX'.length);
   assert(fs.existsSync(tmpFolder));
 
-  const utf8 = fs.mkdtempSync(urljoin(tmpdir.url, '\u0222abc.'));
+  const utf8 = fs.mkdtempSync(tmpdir.fileURL('\u0222abc.'));
   assert.strictEqual(Buffer.byteLength(path.basename(utf8)),
                      Buffer.byteLength('\u0222abc.XXXXXX'));
   assert(fs.existsSync(utf8));
 
-  fs.mkdtemp(urljoin(tmpdir.url, 'bar.'), common.mustCall(handler));
+  fs.mkdtemp(tmpdir.fileURL('bar.'), common.mustCall(handler));
 
   // Same test as above, but making sure that passing an options object doesn't
   // affect the way the callback function is handled.
-  fs.mkdtemp(urljoin(tmpdir.url, 'bar.'), {}, common.mustCall(handler));
+  fs.mkdtemp(tmpdir.fileURL('bar.'), {}, common.mustCall(handler));
 
   // Warning fires only once
-  fs.mkdtemp(urljoin(tmpdir.url, 'bar.X'), common.mustCall(handler));
+  fs.mkdtemp(tmpdir.fileURL('bar.X'), common.mustCall(handler));
 }
 
 // Test with Buffer

test/parallel/test-fs-rm.js

@@ -270,7 +270,7 @@ if (isGitPresent) {
   }
 
   // Should accept URL
-  const fileURL = new URL('rm-file.txt', tmpdir.url);
+  const fileURL = tmpdir.fileURL('rm-file.txt');
   fs.writeFileSync(fileURL, '');
 
   try {
@@ -376,7 +376,7 @@ if (isGitPresent) {
   }
 
   // Should accept URL
-  const fileURL = new URL('rm-promises-file.txt', tmpdir.url);
+  const fileURL = tmpdir.fileURL('rm-promises-file.txt');
   fs.writeFileSync(fileURL, '');
 
   try {