@@ -4,7 +4,6 @@ const common = require('../common');
44const assert = require ( 'assert' ) ;
55const fs = require ( 'fs' ) ;
66const path = require ( 'path' ) ;
7- const { pathToFileURL } = require ( 'url' ) ;
87
98const tmpdir = require ( '../common/tmpdir' ) ;
109tmpdir . refresh ( ) ;
@@ -41,27 +40,24 @@ function handler(err, folder) {
4140
4241// Test with URL object
4342{
44- tmpdir . url = pathToFileURL ( tmpdir . path ) ;
45- const urljoin = ( base , path ) => new URL ( path , base ) ;
46-
47- const tmpFolder = fs . mkdtempSync ( urljoin ( tmpdir . url , 'foo.' ) ) ;
43+ const tmpFolder = fs . mkdtempSync ( tmpdir . fileURL ( 'foo.' ) ) ;
4844
4945 assert . strictEqual ( path . basename ( tmpFolder ) . length , 'foo.XXXXXX' . length ) ;
5046 assert ( fs . existsSync ( tmpFolder ) ) ;
5147
52- const utf8 = fs . mkdtempSync ( urljoin ( tmpdir . url , '\u0222abc.' ) ) ;
48+ const utf8 = fs . mkdtempSync ( tmpdir . fileURL ( '\u0222abc.' ) ) ;
5349 assert . strictEqual ( Buffer . byteLength ( path . basename ( utf8 ) ) ,
5450 Buffer . byteLength ( '\u0222abc.XXXXXX' ) ) ;
5551 assert ( fs . existsSync ( utf8 ) ) ;
5652
57- fs . mkdtemp ( urljoin ( tmpdir . url , 'bar.' ) , common . mustCall ( handler ) ) ;
53+ fs . mkdtemp ( tmpdir . fileURL ( 'bar.' ) , common . mustCall ( handler ) ) ;
5854
5955 // Same test as above, but making sure that passing an options object doesn't
6056 // affect the way the callback function is handled.
61- fs . mkdtemp ( urljoin ( tmpdir . url , 'bar.' ) , { } , common . mustCall ( handler ) ) ;
57+ fs . mkdtemp ( tmpdir . fileURL ( 'bar.' ) , { } , common . mustCall ( handler ) ) ;
6258
6359 // Warning fires only once
64- fs . mkdtemp ( urljoin ( tmpdir . url , 'bar.X' ) , common . mustCall ( handler ) ) ;
60+ fs . mkdtemp ( tmpdir . fileURL ( 'bar.X' ) , common . mustCall ( handler ) ) ;
6561}
6662
6763// Test with Buffer
0 commit comments