-
Notifications
You must be signed in to change notification settings - Fork 30k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
src: return proper URLs from node_api_get_module_file_name
Using `file://${path}` does not properly escape special URL characters. PR-URL: #41758 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Juan José Arboleda <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
- Loading branch information
1 parent
78647ed
commit db9f775
Showing
2 changed files
with
41 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,46 @@ | ||
'use strict'; | ||
|
||
const common = require('../../common'); | ||
const tmpdir = require('../../common/tmpdir'); | ||
const child_process = require('child_process'); | ||
const fs = require('fs'); | ||
const path = require('path'); | ||
const url = require('url'); | ||
const filename = require.resolve(`./build/${common.buildType}/test_general`); | ||
const test_general = require(filename); | ||
const assert = require('assert'); | ||
|
||
// TODO(gabrielschulhof): This test may need updating if/when the filename | ||
// becomes a full-fledged URL. | ||
assert.strictEqual(test_general.filename, `file://${filename}`); | ||
tmpdir.refresh(); | ||
|
||
const [ major, minor, patch, release ] = test_general.testGetNodeVersion(); | ||
assert.strictEqual(process.version.split('-')[0], | ||
`v${major}.${minor}.${patch}`); | ||
assert.strictEqual(release, process.release.name); | ||
{ | ||
// TODO(gabrielschulhof): This test may need updating if/when the filename | ||
// becomes a full-fledged URL. | ||
assert.strictEqual(test_general.filename, url.pathToFileURL(filename).href); | ||
} | ||
|
||
{ | ||
const urlTestDir = path.join(tmpdir.path, 'foo%#bar'); | ||
const urlTestFile = path.join(urlTestDir, path.basename(filename)); | ||
fs.mkdirSync(urlTestDir, { recursive: true }); | ||
fs.copyFileSync(filename, urlTestFile); | ||
// Use a child process as indirection so that the native module is not loaded | ||
// into this process and can be removed here. | ||
const reportedFilename = child_process.spawnSync( | ||
process.execPath, | ||
['-p', `require(${JSON.stringify(urlTestFile)}).filename`], | ||
{ encoding: 'utf8' }).stdout.trim(); | ||
assert.doesNotMatch(reportedFilename, /foo%#bar/); | ||
assert.strictEqual(reportedFilename, url.pathToFileURL(urlTestFile).href); | ||
fs.rmSync(urlTestDir, { | ||
force: true, | ||
recursive: true, | ||
maxRetries: 256 | ||
}); | ||
} | ||
|
||
{ | ||
const [ major, minor, patch, release ] = test_general.testGetNodeVersion(); | ||
assert.strictEqual(process.version.split('-')[0], | ||
`v${major}.${minor}.${patch}`); | ||
assert.strictEqual(release, process.release.name); | ||
} |