Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: fix some assumptions in tests #48958

Merged
merged 4 commits into from
Jul 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions test/es-module/test-cjs-legacyMainResolve-permission.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,21 @@ describe('legacyMainResolve', () => {

const packageJsonUrl = pathToFileURL(
path.resolve(
'${fixtextureFolderEscaped}',
${JSON.stringify(fixtextureFolderEscaped)},
'package.json'
)
);

const packageConfig = { main: '${mainOrFolder}' };
const base = path.resolve(
'${fixtextureFolderEscaped}'
${JSON.stringify(fixtextureFolderEscaped)},
);

assert.throws(() => legacyMainResolve(packageJsonUrl, packageConfig, base), {
code: 'ERR_ACCESS_DENIED',
resource: path.resolve(
'${fixtextureFolderEscaped}',
'${mainOrFolder}'
${JSON.stringify(fixtextureFolderEscaped)},
${JSON.stringify(mainOrFolder)},
)
});
`,
Expand Down Expand Up @@ -103,23 +103,23 @@ describe('legacyMainResolve', () => {

const packageJsonUrl = pathToFileURL(
path.resolve(
'${fixtextureFolderEscaped}',
'${folder}',
${JSON.stringify(fixtextureFolderEscaped)},
${JSON.stringify(folder)},
'package.json'
)
);

const packageConfig = { main: undefined };
const base = path.resolve(
'${fixtextureFolderEscaped}'
${JSON.stringify(fixtextureFolderEscaped)},
);

assert.throws(() => legacyMainResolve(packageJsonUrl, packageConfig, base), {
code: 'ERR_ACCESS_DENIED',
resource: path.resolve(
'${fixtextureFolderEscaped}',
'${folder}',
'${expectedFile}'
${JSON.stringify(fixtextureFolderEscaped)},
${JSON.stringify(folder)},
${JSON.stringify(expectedFile)},
)
});
`,
Expand Down
8 changes: 4 additions & 4 deletions test/es-module/test-esm-dynamic-import.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
'use strict';
const common = require('../common');
const { pathToFileURL } = require('url');
const assert = require('assert');

const relativePath = '../fixtures/es-modules/test-esm-ok.mjs';
const absolutePath = require.resolve('../fixtures/es-modules/test-esm-ok.mjs');
const targetURL = new URL('file:///');
targetURL.pathname = absolutePath;
const absolutePath = require.resolve(relativePath);
const targetURL = pathToFileURL(absolutePath);

function expectModuleError(result, code, message) {
Promise.resolve(result).catch(common.mustCall((error) => {
Expand Down Expand Up @@ -41,7 +41,7 @@ function expectFsNamespace(result) {
// expectOkNamespace(import(relativePath));
expectOkNamespace(eval(`import("${relativePath}")`));
expectOkNamespace(eval(`import("${relativePath}")`));
expectOkNamespace(eval(`import("${targetURL}")`));
expectOkNamespace(eval(`import(${JSON.stringify(targetURL)})`));

// Importing a built-in, both direct & via eval
expectFsNamespace(import('fs'));
Expand Down
10 changes: 5 additions & 5 deletions test/es-module/test-esm-loader-spawn-promisified.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ describe('Loader hooks throwing errors', { concurrency: true }, () => {
fixtures.fileURL('/es-module-loaders/hooks-custom.mjs'),
'--input-type=module',
'--eval',
`import '${fixtures.fileURL('/es-modules/file.unknown')}'`,
`import ${JSON.stringify(fixtures.fileURL('/es-modules/file.unknown'))}`,
]);

assert.match(stderr, /ERR_UNKNOWN_FILE_EXTENSION/);
Expand Down Expand Up @@ -142,7 +142,7 @@ describe('Loader hooks throwing errors', { concurrency: true }, () => {
`import assert from 'node:assert';
await Promise.allSettled([
import('nonexistent/file.mjs'),
import('${fixtures.fileURL('/es-modules/file.unknown')}'),
import(${JSON.stringify(fixtures.fileURL('/es-modules/file.unknown'))}),
import('esmHook/badReturnVal.mjs'),
import('esmHook/format.false'),
import('esmHook/format.true'),
Expand Down Expand Up @@ -170,7 +170,7 @@ describe('Loader hooks parsing modules', { concurrency: true }, () => {
'--input-type=module',
'--eval',
`import assert from 'node:assert';
await import('${fixtures.fileURL('/es-module-loaders/js-as-esm.js')}')
await import(${JSON.stringify(fixtures.fileURL('/es-module-loaders/js-as-esm.js'))})
.then((parsedModule) => {
assert.strictEqual(typeof parsedModule, 'object');
assert.strictEqual(parsedModule.namedExport, 'named-export');
Expand All @@ -191,7 +191,7 @@ describe('Loader hooks parsing modules', { concurrency: true }, () => {
'--input-type=module',
'--eval',
`import assert from 'node:assert';
await import('${fixtures.fileURL('/es-modules/file.ext')}')
await import(${JSON.stringify(fixtures.fileURL('/es-modules/file.ext'))})
.then((parsedModule) => {
assert.strictEqual(typeof parsedModule, 'object');
const { default: defaultExport } = parsedModule;
Expand Down Expand Up @@ -258,7 +258,7 @@ describe('Loader hooks parsing modules', { concurrency: true }, () => {
'--input-type=module',
'--eval',
`import assert from 'node:assert';
await import('${fixtures.fileURL('/es-modules/stateful.mjs')}')
await import(${JSON.stringify(fixtures.fileURL('/es-modules/stateful.mjs'))})
.then(({ default: count }) => {
assert.strictEqual(count(), 1);
});`,
Expand Down
3 changes: 2 additions & 1 deletion test/parallel/test-fs-mkdtemp.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const common = require('../common');
const assert = require('assert');
const fs = require('fs');
const path = require('path');
const { pathToFileURL } = require('url');

const tmpdir = require('../common/tmpdir');
tmpdir.refresh();
Expand Down Expand Up @@ -40,7 +41,7 @@ function handler(err, folder) {

// Test with URL object
{
tmpdir.url = new URL(`file://${tmpdir.path}`);
tmpdir.url = pathToFileURL(tmpdir.path);
const urljoin = (base, path) => new URL(path, base);

const tmpFolder = fs.mkdtempSync(urljoin(tmpdir.url, 'foo.'));
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-internal-util-decorate-error-stack.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ checkStack(err.stack);
// Verify that the stack is only decorated once for uncaught exceptions.
const args = [
'-e',
`require('${badSyntaxPath}')`,
`require(${JSON.stringify(badSyntaxPath)})`,
];
const result = spawnSync(process.argv[0], args, { encoding: 'utf8' });
checkStack(result.stderr);
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-repl-require-context.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ child.on('exit', common.mustCall(() => {

child.stdin.write('const isObject = (obj) => obj.constructor === Object;\n');
child.stdin.write('isObject({});\n');
child.stdin.write(`require('${fixture}').isObject({});\n`);
child.stdin.write(`require(${JSON.stringify(fixture)}).isObject({});\n`);
child.stdin.write('.exit');
child.stdin.end();
2 changes: 1 addition & 1 deletion test/parallel/test-stdio-pipe-stderr.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ fs.writeFileSync(fakeModulePath, '', 'utf8');

stream.on('open', () => {
spawnSync(process.execPath, {
input: `require("${fakeModulePath.replace(/\\/g, '/')}")`,
input: `require(${JSON.stringify(fakeModulePath)})`,
stdio: ['pipe', 'pipe', stream]
});
const stderr = fs.readFileSync(stderrOutputPath, 'utf8').trim();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const { isMainThread } = require('worker_threads');

if (isMainThread) {
const CODE = 'const { Worker } = require(\'worker_threads\'); ' +
`new Worker('${__filename.replace(/\\/g, '/')}', { name: 'foo' })`;
`new Worker(${JSON.stringify(__filename)}, { name: 'foo' })`;
const FILE_NAME = 'node_trace.1.log';
const tmpdir = require('../common/tmpdir');
tmpdir.refresh();
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-trace-events-worker-metadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const { isMainThread } = require('worker_threads');

if (isMainThread) {
const CODE = 'const { Worker } = require(\'worker_threads\'); ' +
`new Worker('${__filename.replace(/\\/g, '/')}')`;
`new Worker(${JSON.stringify(__filename)})`;
const FILE_NAME = 'node_trace.1.log';
const tmpdir = require('../common/tmpdir');
tmpdir.refresh();
Expand Down
13 changes: 7 additions & 6 deletions test/sequential/test-watch-mode.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { describe, it } from 'node:test';
import { spawn } from 'node:child_process';
import { writeFileSync, readFileSync, mkdirSync } from 'node:fs';
import { inspect } from 'node:util';
import { pathToFileURL } from 'node:url';
import { createInterface } from 'node:readline';

if (common.isIBMi)
Expand Down Expand Up @@ -188,7 +189,7 @@ console.log("don't show me");`);
it('should watch changes to dependencies - cjs', async () => {
const dependency = createTmpFile('module.exports = {};');
const file = createTmpFile(`
const dependency = require('${dependency.replace(/\\/g, '/')}');
const dependency = require(${JSON.stringify(dependency)});
console.log(dependency);
`);
const { stderr, stdout } = await runWriteSucceed({ file, watchedFile: dependency });
Expand All @@ -206,7 +207,7 @@ console.log(dependency);
it('should watch changes to dependencies - esm', async () => {
const dependency = createTmpFile('module.exports = {};');
const file = createTmpFile(`
import dependency from 'file://${dependency.replace(/\\/g, '/')}';
import dependency from ${JSON.stringify(pathToFileURL(dependency))};
console.log(dependency);
`, '.mjs');
const { stderr, stdout } = await runWriteSucceed({ file, watchedFile: dependency });
Expand Down Expand Up @@ -276,7 +277,7 @@ console.log(values.random);

it('should not load --import modules in main process', async () => {
const file = createTmpFile();
const imported = `file://${createTmpFile('setImmediate(() => process.exit(0));')}`;
const imported = pathToFileURL(createTmpFile('setImmediate(() => process.exit(0));'));
const args = ['--import', imported, file];
const { stderr, stdout } = await runWriteSucceed({ file, watchedFile: file, args });

Expand Down Expand Up @@ -318,9 +319,9 @@ console.log(values.random);
it('should watch changes to previously missing ESM dependency', {
skip: !supportsRecursive
}, async () => {
const dependency = path.join(tmpdir.path, `${tmpFiles++}.mjs`);
const relativeDependencyPath = `./${path.basename(dependency)}`;
const dependant = createTmpFile(`import '${relativeDependencyPath}'`, '.mjs');
const relativeDependencyPath = `./${tmpFiles++}.mjs`;
const dependency = path.join(tmpdir.path, relativeDependencyPath);
const dependant = createTmpFile(`import ${JSON.stringify(relativeDependencyPath)}`, '.mjs');

await failWriteSucceed({ file: dependant, watchedFile: dependency });
});
Expand Down