@@ -4,7 +4,6 @@ const common = require('../common');
4
4
const assert = require ( 'assert' ) ;
5
5
const fs = require ( 'fs' ) ;
6
6
const path = require ( 'path' ) ;
7
- const { pathToFileURL } = require ( 'url' ) ;
8
7
9
8
const tmpdir = require ( '../common/tmpdir' ) ;
10
9
tmpdir . refresh ( ) ;
@@ -41,27 +40,24 @@ function handler(err, folder) {
41
40
42
41
// Test with URL object
43
42
{
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.' ) ) ;
48
44
49
45
assert . strictEqual ( path . basename ( tmpFolder ) . length , 'foo.XXXXXX' . length ) ;
50
46
assert ( fs . existsSync ( tmpFolder ) ) ;
51
47
52
- const utf8 = fs . mkdtempSync ( urljoin ( tmpdir . url , '\u0222abc.' ) ) ;
48
+ const utf8 = fs . mkdtempSync ( tmpdir . fileURL ( '\u0222abc.' ) ) ;
53
49
assert . strictEqual ( Buffer . byteLength ( path . basename ( utf8 ) ) ,
54
50
Buffer . byteLength ( '\u0222abc.XXXXXX' ) ) ;
55
51
assert ( fs . existsSync ( utf8 ) ) ;
56
52
57
- fs . mkdtemp ( urljoin ( tmpdir . url , 'bar.' ) , common . mustCall ( handler ) ) ;
53
+ fs . mkdtemp ( tmpdir . fileURL ( 'bar.' ) , common . mustCall ( handler ) ) ;
58
54
59
55
// Same test as above, but making sure that passing an options object doesn't
60
56
// 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 ) ) ;
62
58
63
59
// 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 ) ) ;
65
61
}
66
62
67
63
// Test with Buffer
0 commit comments