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
7 changes: 3 additions & 4 deletions test/message/node_run_list.js
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
'use strict';

require('../common');
const assert = require('node:assert/strict');
const childProcess = require('node:child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const fixtures = require('../common/fixtures');

const child = childProcess.spawnSync(
const { child } = spawnSyncAndExit(
process.execPath,
[ '--no-warnings', '--run'],
{ cwd: fixtures.path('run-script'), encoding: 'utf8' },
{ status: 9, signal: null },
);
assert.strictEqual(child.status, 9);
console.log(child.stderr);
Comment thread
aduh95 marked this conversation as resolved.
4 changes: 2 additions & 2 deletions test/parallel/test-common-wpt-backends.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ const assert = require('assert');
const fs = require('fs');
const path = require('path');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const { backends, WPTRunner } = require('../common/wpt');

const queueProbe = process.env.NODE_TEST_WPT_QUEUE_PROBE === '1';
Expand DownExpand Up@@ -106,12 +107,11 @@ async function compare(throws) {
// End to end: the runner's own reporting has to match too. The webidl spec
// reports an uncaught error whose name the status file matches on.
function runDriver(driver, spec, backend) {
const { status, stdout, stderr } = spawnSync(
const { child: { stdout } } = spawnSyncAndExitWithoutError(
process.execPath,
[path.join(__dirname, '../wpt', driver), spec],
{ env: { ...process.env, WPT_BACKEND: backend }, encoding: 'utf8' },
);
assert.strictEqual(status, 0, `${spec} failed on the ${backend} backend:\n${stdout}${stderr}`);
// Specs run concurrently, so the lines arrive in an arbitrary order.
return stdout.split('\n').filter((line) => line.startsWith('[')).sort();
}
Expand Down
8 changes: 3 additions & 5 deletions test/parallel/test-fs-glob.mjs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import * as common from '../common/index.mjs';
import tmpdir from '../common/tmpdir.js';
import { spawnSync } from 'node:child_process';
import { spawnSyncAndExitWithoutError } from '../common/child_process.js';
import { resolve, dirname, sep, relative, join, isAbsolute } from 'node:path';
import { mkdir, writeFile, symlink, glob as asyncGlob } from 'node:fs/promises';
import {
Expand DownExpand Up@@ -707,12 +707,11 @@ test('glob forwards maxDepth', async () => {
});

function runNodeScript(script) {
const child = spawnSync(
const { child } = spawnSyncAndExitWithoutError(
process.execPath,
['--expose-internals', '-e', script],
{ encoding: 'utf8' },
);
assert.strictEqual(child.status, 0, child.stderr || child.stdout);
return child.stdout;
}

Expand DownExpand Up@@ -992,11 +991,10 @@ describe('glob - seen cache', function() {
`;

const seenDir = tmpdir.resolve('glob-seen');
const child = spawnSync(
spawnSyncAndExitWithoutError(
process.execPath,
['--expose-internals', '-e', script, seenDir],
{ encoding: 'utf8' },
);
assert.strictEqual(child.status, 0, child.stderr || child.stdout);
});
});
10 changes: 5 additions & 5 deletions test/parallel/test-module-unreadable-package-json.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ const assert = require('assert');
const fs = require('fs');
const path = require('path');
const { spawnSync } = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const tmpdir = require('../common/tmpdir');

tmpdir.refresh();
Expand All@@ -38,11 +39,10 @@ const entry = tmpdir.resolve('main.mjs');
fs.writeFileSync(entry, 'import { which } from "dep"; console.log(which);');

// Sanity check: the export resolves while the package config is readable.
{
const child = spawnSync(process.execPath, [entry], { encoding: 'utf8' });
assert.strictEqual(child.stdout.trim(), 'real');
assert.strictEqual(child.status, 0, child.stderr);
}
spawnSyncAndAssert(process.execPath, [entry], { encoding: 'utf8' }, {
stdout: 'real',
trim: true,
});

fs.chmodSync(depPackageJson, 0o000);

Expand Down
19 changes: 9 additions & 10 deletions test/parallel/test-runner-cli.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const { join } = require('path');
const fixtures = require('../common/fixtures');
const testFixtures = fixtures.path('test-runner');
Expand DownExpand Up@@ -70,16 +71,14 @@ for (const isolation of ['none', 'process']) {
const args = ['--test', '--test-reporter=tap',
'--no-experimental-strip-types',
`--test-isolation=${isolation}`, dir];
const child = spawnSync(process.execPath, args, { cwd: testFixtures });

assert.strictEqual(child.status, 0);
assert.strictEqual(child.signal, null);
assert.strictEqual(child.stderr.toString(), '');
const stdout = child.stdout.toString();

assert.match(stdout, /ok 1 - this should pass/);
assert.match(stdout, /ok 2 - this should pass/);
assert.match(stdout, /ok 3 - this should pass/);
spawnSyncAndAssert(process.execPath, args, { cwd: testFixtures }, {
stderr: '',
stdout(output) {
assert.match(output, /ok 1 - this should pass/);
assert.match(output, /ok 2 - this should pass/);
assert.match(output, /ok 3 - this should pass/);
},
});
}
}

Expand Down
42 changes: 20 additions & 22 deletions test/parallel/test-runner-coverage-default-exclusion.mjs
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import '../common/index.mjs';
import { before, describe, it } from 'node:test';
import assert from 'node:assert';
import { spawnSync } from 'node:child_process';
import { cp } from 'node:fs/promises';
import tmpdir from '../common/tmpdir.js';
import fixtures from '../common/fixtures.js';
import { spawnSyncAndAssert } from '../common/child_process.js';
const skipIfNoInspector = {
skip: !process.features.inspector ? 'inspector disabled' : false
};
Expand DownExpand Up@@ -57,14 +57,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--test-reporter=tap',
'--no-experimental-strip-types',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: new RegExp(RegExp.escape(report)),
});

assert.strictEqual(result.stderr.toString(), '');
assert(result.stdout.toString().includes(report));
assert.strictEqual(result.status, 0);
});

it('should exclude test files from coverage by default', async () => {
Expand All@@ -74,14 +73,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--experimental-test-coverage',
'--test-reporter=tap',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: assertDefaultExclusions,
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.strictEqual(result.status, 0);
});

it('should exclude ts test files', async () => {
Expand All@@ -91,14 +89,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--disable-warning=ExperimentalWarning',
'--test-reporter=tap',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: assertDefaultExclusions,
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.strictEqual(result.status, 0);
});

it('should exclude dotfile test files from coverage by default', async () => {
Expand All@@ -109,14 +106,15 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--test-reporter=tap',
'test/.dotfile.cjs',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout(output) {
assertDefaultExclusions(output);
assert.doesNotMatch(output, /#\s+\.dotfile\.cjs\s+\|/);
},
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.doesNotMatch(result.stdout.toString(), /#\s+\.dotfile\.cjs\s+\|/);
assert.strictEqual(result.status, 0);
});
});
26 changes: 14 additions & 12 deletions test/parallel/test-runner-coverage-thresholds.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
const common = require('../common');
const assert = require('node:assert');
const { spawnSync } = require('node:child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const { readdirSync } = require('node:fs');
const { test } = require('node:test');
const fixtures = require('../common/fixtures');
Expand DownExpand Up@@ -172,23 +173,24 @@ for (const coverage of coverages) {
});

test(`test failing ${coverage.flag} with dot reporter`, () => {
const result = spawnSync(process.execPath, [
const { child } = spawnSyncAndExit(process.execPath, [
'--test',
'--experimental-test-coverage',
'--test-coverage-exclude=!test/**',
`${coverage.flag}=99`,
'--test-reporter', 'dot',
fixture,
]);

const stdout = result.stdout.toString();
assert.match(
stdout,
RegExp(`Error: ${coverage.actual.toFixed(2)}% ${coverage.name} coverage does not meet threshold of 99%`)
);
assert.match(stdout, /start of coverage report/);
assert.match(stdout, /end of coverage report/);
assert.strictEqual(result.status, 1);
assert(!findCoverageFileForPid(result.pid));
], {
status: 1,
stdout(output) {
assert.match(
output,
RegExp(`Error: ${coverage.actual.toFixed(2)}% ${coverage.name} coverage does not meet threshold of 99%`)
);
assert.match(output, /start of coverage report/);
assert.match(output, /end of coverage report/);
},
});
assert(!findCoverageFileForPid(child.pid));
});
}
5 changes: 2 additions & 3 deletions test/pseudo-tty/test-set-raw-mode-modes.js
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
'use strict';
require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

function isOnlcrEnabled() {
const { stdout, stderr, status } = spawnSync('stty', ['-a'], {
const { child: { stdout } } = spawnSyncAndExitWithoutError('stty', ['-a'], {
encoding: 'utf8',
stdio: ['inherit', 'pipe', 'pipe'],
});

assert.strictEqual(status, 0, stderr);
return /(?:^|[\s;])onlcr(?:[\s;]|$)/.test(stdout);
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
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
7 changes: 3 additions & 4 deletions test/message/node_run_list.js
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
'use strict';

require('../common');
const assert = require('node:assert/strict');
const childProcess = require('node:child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const fixtures = require('../common/fixtures');

const child = childProcess.spawnSync(
const { child } = spawnSyncAndExit(
process.execPath,
[ '--no-warnings', '--run'],
{ cwd: fixtures.path('run-script'), encoding: 'utf8' },
{ status: 9, signal: null },
);
assert.strictEqual(child.status, 9);
console.log(child.stderr);
Comment thread
aduh95 marked this conversation as resolved.
4 changes: 2 additions & 2 deletions test/parallel/test-common-wpt-backends.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ const assert = require('assert');
const fs = require('fs');
const path = require('path');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const { backends, WPTRunner } = require('../common/wpt');

const queueProbe = process.env.NODE_TEST_WPT_QUEUE_PROBE === '1';
Expand DownExpand Up@@ -106,12 +107,11 @@ async function compare(throws) {
// End to end: the runner's own reporting has to match too. The webidl spec
// reports an uncaught error whose name the status file matches on.
function runDriver(driver, spec, backend) {
const { status, stdout, stderr } = spawnSync(
const { child: { stdout } } = spawnSyncAndExitWithoutError(
process.execPath,
[path.join(__dirname, '../wpt', driver), spec],
{ env: { ...process.env, WPT_BACKEND: backend }, encoding: 'utf8' },
);
assert.strictEqual(status, 0, `${spec} failed on the ${backend} backend:\n${stdout}${stderr}`);
// Specs run concurrently, so the lines arrive in an arbitrary order.
return stdout.split('\n').filter((line) => line.startsWith('[')).sort();
}
Expand Down
8 changes: 3 additions & 5 deletions test/parallel/test-fs-glob.mjs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import * as common from '../common/index.mjs';
import tmpdir from '../common/tmpdir.js';
import { spawnSync } from 'node:child_process';
import { spawnSyncAndExitWithoutError } from '../common/child_process.js';
import { resolve, dirname, sep, relative, join, isAbsolute } from 'node:path';
import { mkdir, writeFile, symlink, glob as asyncGlob } from 'node:fs/promises';
import {
Expand DownExpand Up@@ -707,12 +707,11 @@ test('glob forwards maxDepth', async () => {
});

function runNodeScript(script) {
const child = spawnSync(
const { child } = spawnSyncAndExitWithoutError(
process.execPath,
['--expose-internals', '-e', script],
{ encoding: 'utf8' },
);
assert.strictEqual(child.status, 0, child.stderr || child.stdout);
return child.stdout;
}

Expand DownExpand Up@@ -992,11 +991,10 @@ describe('glob - seen cache', function() {
`;

const seenDir = tmpdir.resolve('glob-seen');
const child = spawnSync(
spawnSyncAndExitWithoutError(
process.execPath,
['--expose-internals', '-e', script, seenDir],
{ encoding: 'utf8' },
);
assert.strictEqual(child.status, 0, child.stderr || child.stdout);
});
});
10 changes: 5 additions & 5 deletions test/parallel/test-module-unreadable-package-json.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ const assert = require('assert');
const fs = require('fs');
const path = require('path');
const { spawnSync } = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const tmpdir = require('../common/tmpdir');

tmpdir.refresh();
Expand All@@ -38,11 +39,10 @@ const entry = tmpdir.resolve('main.mjs');
fs.writeFileSync(entry, 'import { which } from "dep"; console.log(which);');

// Sanity check: the export resolves while the package config is readable.
{
const child = spawnSync(process.execPath, [entry], { encoding: 'utf8' });
assert.strictEqual(child.stdout.trim(), 'real');
assert.strictEqual(child.status, 0, child.stderr);
}
spawnSyncAndAssert(process.execPath, [entry], { encoding: 'utf8' }, {
stdout: 'real',
trim: true,
});

fs.chmodSync(depPackageJson, 0o000);

Expand Down
19 changes: 9 additions & 10 deletions test/parallel/test-runner-cli.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const { join } = require('path');
const fixtures = require('../common/fixtures');
const testFixtures = fixtures.path('test-runner');
Expand DownExpand Up@@ -70,16 +71,14 @@ for (const isolation of ['none', 'process']) {
const args = ['--test', '--test-reporter=tap',
'--no-experimental-strip-types',
`--test-isolation=${isolation}`, dir];
const child = spawnSync(process.execPath, args, { cwd: testFixtures });

assert.strictEqual(child.status, 0);
assert.strictEqual(child.signal, null);
assert.strictEqual(child.stderr.toString(), '');
const stdout = child.stdout.toString();

assert.match(stdout, /ok 1 - this should pass/);
assert.match(stdout, /ok 2 - this should pass/);
assert.match(stdout, /ok 3 - this should pass/);
spawnSyncAndAssert(process.execPath, args, { cwd: testFixtures }, {
stderr: '',
stdout(output) {
assert.match(output, /ok 1 - this should pass/);
assert.match(output, /ok 2 - this should pass/);
assert.match(output, /ok 3 - this should pass/);
},
});
}
}

Expand Down
42 changes: 20 additions & 22 deletions test/parallel/test-runner-coverage-default-exclusion.mjs
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import '../common/index.mjs';
import { before, describe, it } from 'node:test';
import assert from 'node:assert';
import { spawnSync } from 'node:child_process';
import { cp } from 'node:fs/promises';
import tmpdir from '../common/tmpdir.js';
import fixtures from '../common/fixtures.js';
import { spawnSyncAndAssert } from '../common/child_process.js';
const skipIfNoInspector = {
skip: !process.features.inspector ? 'inspector disabled' : false
};
Expand DownExpand Up@@ -57,14 +57,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--test-reporter=tap',
'--no-experimental-strip-types',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: new RegExp(RegExp.escape(report)),
});

assert.strictEqual(result.stderr.toString(), '');
assert(result.stdout.toString().includes(report));
assert.strictEqual(result.status, 0);
});

it('should exclude test files from coverage by default', async () => {
Expand All@@ -74,14 +73,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--experimental-test-coverage',
'--test-reporter=tap',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: assertDefaultExclusions,
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.strictEqual(result.status, 0);
});

it('should exclude ts test files', async () => {
Expand All@@ -91,14 +89,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--disable-warning=ExperimentalWarning',
'--test-reporter=tap',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: assertDefaultExclusions,
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.strictEqual(result.status, 0);
});

it('should exclude dotfile test files from coverage by default', async () => {
Expand All@@ -109,14 +106,15 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--test-reporter=tap',
'test/.dotfile.cjs',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout(output) {
assertDefaultExclusions(output);
assert.doesNotMatch(output, /#\s+\.dotfile\.cjs\s+\|/);
},
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.doesNotMatch(result.stdout.toString(), /#\s+\.dotfile\.cjs\s+\|/);
assert.strictEqual(result.status, 0);
});
});
26 changes: 14 additions & 12 deletions test/parallel/test-runner-coverage-thresholds.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
const common = require('../common');
const assert = require('node:assert');
const { spawnSync } = require('node:child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const { readdirSync } = require('node:fs');
const { test } = require('node:test');
const fixtures = require('../common/fixtures');
Expand DownExpand Up@@ -172,23 +173,24 @@ for (const coverage of coverages) {
});

test(`test failing ${coverage.flag} with dot reporter`, () => {
const result = spawnSync(process.execPath, [
const { child } = spawnSyncAndExit(process.execPath, [
'--test',
'--experimental-test-coverage',
'--test-coverage-exclude=!test/**',
`${coverage.flag}=99`,
'--test-reporter', 'dot',
fixture,
]);

const stdout = result.stdout.toString();
assert.match(
stdout,
RegExp(`Error: ${coverage.actual.toFixed(2)}% ${coverage.name} coverage does not meet threshold of 99%`)
);
assert.match(stdout, /start of coverage report/);
assert.match(stdout, /end of coverage report/);
assert.strictEqual(result.status, 1);
assert(!findCoverageFileForPid(result.pid));
], {
status: 1,
stdout(output) {
assert.match(
output,
RegExp(`Error: ${coverage.actual.toFixed(2)}% ${coverage.name} coverage does not meet threshold of 99%`)
);
assert.match(output, /start of coverage report/);
assert.match(output, /end of coverage report/);
},
});
assert(!findCoverageFileForPid(child.pid));
});
}
5 changes: 2 additions & 3 deletions test/pseudo-tty/test-set-raw-mode-modes.js
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
'use strict';
require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

function isOnlcrEnabled() {
const { stdout, stderr, status } = spawnSync('stty', ['-a'], {
const { child: { stdout } } = spawnSyncAndExitWithoutError('stty', ['-a'], {
encoding: 'utf8',
stdio: ['inherit', 'pipe', 'pipe'],
});

assert.strictEqual(status, 0, stderr);
return /(?:^|[\s;])onlcr(?:[\s;]|$)/.test(stdout);
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
7 changes: 3 additions & 4 deletions test/message/node_run_list.js
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
'use strict';

require('../common');
const assert = require('node:assert/strict');
const childProcess = require('node:child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const fixtures = require('../common/fixtures');

const child = childProcess.spawnSync(
const { child } = spawnSyncAndExit(
process.execPath,
[ '--no-warnings', '--run'],
{ cwd: fixtures.path('run-script'), encoding: 'utf8' },
{ status: 9, signal: null },
);
assert.strictEqual(child.status, 9);
console.log(child.stderr);
Comment thread
aduh95 marked this conversation as resolved.
4 changes: 2 additions & 2 deletions test/parallel/test-common-wpt-backends.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ const assert = require('assert');
const fs = require('fs');
const path = require('path');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const { backends, WPTRunner } = require('../common/wpt');

const queueProbe = process.env.NODE_TEST_WPT_QUEUE_PROBE === '1';
Expand DownExpand Up@@ -106,12 +107,11 @@ async function compare(throws) {
// End to end: the runner's own reporting has to match too. The webidl spec
// reports an uncaught error whose name the status file matches on.
function runDriver(driver, spec, backend) {
const { status, stdout, stderr } = spawnSync(
const { child: { stdout } } = spawnSyncAndExitWithoutError(
process.execPath,
[path.join(__dirname, '../wpt', driver), spec],
{ env: { ...process.env, WPT_BACKEND: backend }, encoding: 'utf8' },
);
assert.strictEqual(status, 0, `${spec} failed on the ${backend} backend:\n${stdout}${stderr}`);
// Specs run concurrently, so the lines arrive in an arbitrary order.
return stdout.split('\n').filter((line) => line.startsWith('[')).sort();
}
Expand Down
8 changes: 3 additions & 5 deletions test/parallel/test-fs-glob.mjs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import * as common from '../common/index.mjs';
import tmpdir from '../common/tmpdir.js';
import { spawnSync } from 'node:child_process';
import { spawnSyncAndExitWithoutError } from '../common/child_process.js';
import { resolve, dirname, sep, relative, join, isAbsolute } from 'node:path';
import { mkdir, writeFile, symlink, glob as asyncGlob } from 'node:fs/promises';
import {
Expand DownExpand Up@@ -707,12 +707,11 @@ test('glob forwards maxDepth', async () => {
});

function runNodeScript(script) {
const child = spawnSync(
const { child } = spawnSyncAndExitWithoutError(
process.execPath,
['--expose-internals', '-e', script],
{ encoding: 'utf8' },
);
assert.strictEqual(child.status, 0, child.stderr || child.stdout);
return child.stdout;
}

Expand DownExpand Up@@ -992,11 +991,10 @@ describe('glob - seen cache', function() {
`;

const seenDir = tmpdir.resolve('glob-seen');
const child = spawnSync(
spawnSyncAndExitWithoutError(
process.execPath,
['--expose-internals', '-e', script, seenDir],
{ encoding: 'utf8' },
);
assert.strictEqual(child.status, 0, child.stderr || child.stdout);
});
});
10 changes: 5 additions & 5 deletions test/parallel/test-module-unreadable-package-json.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ const assert = require('assert');
const fs = require('fs');
const path = require('path');
const { spawnSync } = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const tmpdir = require('../common/tmpdir');

tmpdir.refresh();
Expand All@@ -38,11 +39,10 @@ const entry = tmpdir.resolve('main.mjs');
fs.writeFileSync(entry, 'import { which } from "dep"; console.log(which);');

// Sanity check: the export resolves while the package config is readable.
{
const child = spawnSync(process.execPath, [entry], { encoding: 'utf8' });
assert.strictEqual(child.stdout.trim(), 'real');
assert.strictEqual(child.status, 0, child.stderr);
}
spawnSyncAndAssert(process.execPath, [entry], { encoding: 'utf8' }, {
stdout: 'real',
trim: true,
});

fs.chmodSync(depPackageJson, 0o000);

Expand Down
19 changes: 9 additions & 10 deletions test/parallel/test-runner-cli.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const { join } = require('path');
const fixtures = require('../common/fixtures');
const testFixtures = fixtures.path('test-runner');
Expand DownExpand Up@@ -70,16 +71,14 @@ for (const isolation of ['none', 'process']) {
const args = ['--test', '--test-reporter=tap',
'--no-experimental-strip-types',
`--test-isolation=${isolation}`, dir];
const child = spawnSync(process.execPath, args, { cwd: testFixtures });

assert.strictEqual(child.status, 0);
assert.strictEqual(child.signal, null);
assert.strictEqual(child.stderr.toString(), '');
const stdout = child.stdout.toString();

assert.match(stdout, /ok 1 - this should pass/);
assert.match(stdout, /ok 2 - this should pass/);
assert.match(stdout, /ok 3 - this should pass/);
spawnSyncAndAssert(process.execPath, args, { cwd: testFixtures }, {
stderr: '',
stdout(output) {
assert.match(output, /ok 1 - this should pass/);
assert.match(output, /ok 2 - this should pass/);
assert.match(output, /ok 3 - this should pass/);
},
});
}
}

Expand Down
42 changes: 20 additions & 22 deletions test/parallel/test-runner-coverage-default-exclusion.mjs
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import '../common/index.mjs';
import { before, describe, it } from 'node:test';
import assert from 'node:assert';
import { spawnSync } from 'node:child_process';
import { cp } from 'node:fs/promises';
import tmpdir from '../common/tmpdir.js';
import fixtures from '../common/fixtures.js';
import { spawnSyncAndAssert } from '../common/child_process.js';
const skipIfNoInspector = {
skip: !process.features.inspector ? 'inspector disabled' : false
};
Expand DownExpand Up@@ -57,14 +57,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--test-reporter=tap',
'--no-experimental-strip-types',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: new RegExp(RegExp.escape(report)),
});

assert.strictEqual(result.stderr.toString(), '');
assert(result.stdout.toString().includes(report));
assert.strictEqual(result.status, 0);
});

it('should exclude test files from coverage by default', async () => {
Expand All@@ -74,14 +73,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--experimental-test-coverage',
'--test-reporter=tap',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: assertDefaultExclusions,
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.strictEqual(result.status, 0);
});

it('should exclude ts test files', async () => {
Expand All@@ -91,14 +89,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--disable-warning=ExperimentalWarning',
'--test-reporter=tap',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: assertDefaultExclusions,
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.strictEqual(result.status, 0);
});

it('should exclude dotfile test files from coverage by default', async () => {
Expand All@@ -109,14 +106,15 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--test-reporter=tap',
'test/.dotfile.cjs',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout(output) {
assertDefaultExclusions(output);
assert.doesNotMatch(output, /#\s+\.dotfile\.cjs\s+\|/);
},
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.doesNotMatch(result.stdout.toString(), /#\s+\.dotfile\.cjs\s+\|/);
assert.strictEqual(result.status, 0);
});
});
26 changes: 14 additions & 12 deletions test/parallel/test-runner-coverage-thresholds.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
const common = require('../common');
const assert = require('node:assert');
const { spawnSync } = require('node:child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const { readdirSync } = require('node:fs');
const { test } = require('node:test');
const fixtures = require('../common/fixtures');
Expand DownExpand Up@@ -172,23 +173,24 @@ for (const coverage of coverages) {
});

test(`test failing ${coverage.flag} with dot reporter`, () => {
const result = spawnSync(process.execPath, [
const { child } = spawnSyncAndExit(process.execPath, [
'--test',
'--experimental-test-coverage',
'--test-coverage-exclude=!test/**',
`${coverage.flag}=99`,
'--test-reporter', 'dot',
fixture,
]);

const stdout = result.stdout.toString();
assert.match(
stdout,
RegExp(`Error: ${coverage.actual.toFixed(2)}% ${coverage.name} coverage does not meet threshold of 99%`)
);
assert.match(stdout, /start of coverage report/);
assert.match(stdout, /end of coverage report/);
assert.strictEqual(result.status, 1);
assert(!findCoverageFileForPid(result.pid));
], {
status: 1,
stdout(output) {
assert.match(
output,
RegExp(`Error: ${coverage.actual.toFixed(2)}% ${coverage.name} coverage does not meet threshold of 99%`)
);
assert.match(output, /start of coverage report/);
assert.match(output, /end of coverage report/);
},
});
assert(!findCoverageFileForPid(child.pid));
});
}
5 changes: 2 additions & 3 deletions test/pseudo-tty/test-set-raw-mode-modes.js
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
'use strict';
require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

function isOnlcrEnabled() {
const { stdout, stderr, status } = spawnSync('stty', ['-a'], {
const { child: { stdout } } = spawnSyncAndExitWithoutError('stty', ['-a'], {
encoding: 'utf8',
stdio: ['inherit', 'pipe', 'pipe'],
});

assert.strictEqual(status, 0, stderr);
return /(?:^|[\s;])onlcr(?:[\s;]|$)/.test(stdout);
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
7 changes: 3 additions & 4 deletions test/message/node_run_list.js
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
'use strict';

require('../common');
const assert = require('node:assert/strict');
const childProcess = require('node:child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const fixtures = require('../common/fixtures');

const child = childProcess.spawnSync(
const { child } = spawnSyncAndExit(
process.execPath,
[ '--no-warnings', '--run'],
{ cwd: fixtures.path('run-script'), encoding: 'utf8' },
{ status: 9, signal: null },
);
assert.strictEqual(child.status, 9);
console.log(child.stderr);
Comment thread
aduh95 marked this conversation as resolved.
4 changes: 2 additions & 2 deletions test/parallel/test-common-wpt-backends.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ const assert = require('assert');
const fs = require('fs');
const path = require('path');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const { backends, WPTRunner } = require('../common/wpt');

const queueProbe = process.env.NODE_TEST_WPT_QUEUE_PROBE === '1';
Expand DownExpand Up@@ -106,12 +107,11 @@ async function compare(throws) {
// End to end: the runner's own reporting has to match too. The webidl spec
// reports an uncaught error whose name the status file matches on.
function runDriver(driver, spec, backend) {
const { status, stdout, stderr } = spawnSync(
const { child: { stdout } } = spawnSyncAndExitWithoutError(
process.execPath,
[path.join(__dirname, '../wpt', driver), spec],
{ env: { ...process.env, WPT_BACKEND: backend }, encoding: 'utf8' },
);
assert.strictEqual(status, 0, `${spec} failed on the ${backend} backend:\n${stdout}${stderr}`);
// Specs run concurrently, so the lines arrive in an arbitrary order.
return stdout.split('\n').filter((line) => line.startsWith('[')).sort();
}
Expand Down
8 changes: 3 additions & 5 deletions test/parallel/test-fs-glob.mjs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import * as common from '../common/index.mjs';
import tmpdir from '../common/tmpdir.js';
import { spawnSync } from 'node:child_process';
import { spawnSyncAndExitWithoutError } from '../common/child_process.js';
import { resolve, dirname, sep, relative, join, isAbsolute } from 'node:path';
import { mkdir, writeFile, symlink, glob as asyncGlob } from 'node:fs/promises';
import {
Expand DownExpand Up@@ -707,12 +707,11 @@ test('glob forwards maxDepth', async () => {
});

function runNodeScript(script) {
const child = spawnSync(
const { child } = spawnSyncAndExitWithoutError(
process.execPath,
['--expose-internals', '-e', script],
{ encoding: 'utf8' },
);
assert.strictEqual(child.status, 0, child.stderr || child.stdout);
return child.stdout;
}

Expand DownExpand Up@@ -992,11 +991,10 @@ describe('glob - seen cache', function() {
`;

const seenDir = tmpdir.resolve('glob-seen');
const child = spawnSync(
spawnSyncAndExitWithoutError(
process.execPath,
['--expose-internals', '-e', script, seenDir],
{ encoding: 'utf8' },
);
assert.strictEqual(child.status, 0, child.stderr || child.stdout);
});
});
10 changes: 5 additions & 5 deletions test/parallel/test-module-unreadable-package-json.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ const assert = require('assert');
const fs = require('fs');
const path = require('path');
const { spawnSync } = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const tmpdir = require('../common/tmpdir');

tmpdir.refresh();
Expand All@@ -38,11 +39,10 @@ const entry = tmpdir.resolve('main.mjs');
fs.writeFileSync(entry, 'import { which } from "dep"; console.log(which);');

// Sanity check: the export resolves while the package config is readable.
{
const child = spawnSync(process.execPath, [entry], { encoding: 'utf8' });
assert.strictEqual(child.stdout.trim(), 'real');
assert.strictEqual(child.status, 0, child.stderr);
}
spawnSyncAndAssert(process.execPath, [entry], { encoding: 'utf8' }, {
stdout: 'real',
trim: true,
});

fs.chmodSync(depPackageJson, 0o000);

Expand Down
19 changes: 9 additions & 10 deletions test/parallel/test-runner-cli.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const { join } = require('path');
const fixtures = require('../common/fixtures');
const testFixtures = fixtures.path('test-runner');
Expand DownExpand Up@@ -70,16 +71,14 @@ for (const isolation of ['none', 'process']) {
const args = ['--test', '--test-reporter=tap',
'--no-experimental-strip-types',
`--test-isolation=${isolation}`, dir];
const child = spawnSync(process.execPath, args, { cwd: testFixtures });

assert.strictEqual(child.status, 0);
assert.strictEqual(child.signal, null);
assert.strictEqual(child.stderr.toString(), '');
const stdout = child.stdout.toString();

assert.match(stdout, /ok 1 - this should pass/);
assert.match(stdout, /ok 2 - this should pass/);
assert.match(stdout, /ok 3 - this should pass/);
spawnSyncAndAssert(process.execPath, args, { cwd: testFixtures }, {
stderr: '',
stdout(output) {
assert.match(output, /ok 1 - this should pass/);
assert.match(output, /ok 2 - this should pass/);
assert.match(output, /ok 3 - this should pass/);
},
});
}
}

Expand Down
42 changes: 20 additions & 22 deletions test/parallel/test-runner-coverage-default-exclusion.mjs
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import '../common/index.mjs';
import { before, describe, it } from 'node:test';
import assert from 'node:assert';
import { spawnSync } from 'node:child_process';
import { cp } from 'node:fs/promises';
import tmpdir from '../common/tmpdir.js';
import fixtures from '../common/fixtures.js';
import { spawnSyncAndAssert } from '../common/child_process.js';
const skipIfNoInspector = {
skip: !process.features.inspector ? 'inspector disabled' : false
};
Expand DownExpand Up@@ -57,14 +57,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--test-reporter=tap',
'--no-experimental-strip-types',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: new RegExp(RegExp.escape(report)),
});

assert.strictEqual(result.stderr.toString(), '');
assert(result.stdout.toString().includes(report));
assert.strictEqual(result.status, 0);
});

it('should exclude test files from coverage by default', async () => {
Expand All@@ -74,14 +73,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--experimental-test-coverage',
'--test-reporter=tap',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: assertDefaultExclusions,
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.strictEqual(result.status, 0);
});

it('should exclude ts test files', async () => {
Expand All@@ -91,14 +89,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--disable-warning=ExperimentalWarning',
'--test-reporter=tap',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: assertDefaultExclusions,
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.strictEqual(result.status, 0);
});

it('should exclude dotfile test files from coverage by default', async () => {
Expand All@@ -109,14 +106,15 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--test-reporter=tap',
'test/.dotfile.cjs',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout(output) {
assertDefaultExclusions(output);
assert.doesNotMatch(output, /#\s+\.dotfile\.cjs\s+\|/);
},
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.doesNotMatch(result.stdout.toString(), /#\s+\.dotfile\.cjs\s+\|/);
assert.strictEqual(result.status, 0);
});
});
26 changes: 14 additions & 12 deletions test/parallel/test-runner-coverage-thresholds.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
const common = require('../common');
const assert = require('node:assert');
const { spawnSync } = require('node:child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const { readdirSync } = require('node:fs');
const { test } = require('node:test');
const fixtures = require('../common/fixtures');
Expand DownExpand Up@@ -172,23 +173,24 @@ for (const coverage of coverages) {
});

test(`test failing ${coverage.flag} with dot reporter`, () => {
const result = spawnSync(process.execPath, [
const { child } = spawnSyncAndExit(process.execPath, [
'--test',
'--experimental-test-coverage',
'--test-coverage-exclude=!test/**',
`${coverage.flag}=99`,
'--test-reporter', 'dot',
fixture,
]);

const stdout = result.stdout.toString();
assert.match(
stdout,
RegExp(`Error: ${coverage.actual.toFixed(2)}% ${coverage.name} coverage does not meet threshold of 99%`)
);
assert.match(stdout, /start of coverage report/);
assert.match(stdout, /end of coverage report/);
assert.strictEqual(result.status, 1);
assert(!findCoverageFileForPid(result.pid));
], {
status: 1,
stdout(output) {
assert.match(
output,
RegExp(`Error: ${coverage.actual.toFixed(2)}% ${coverage.name} coverage does not meet threshold of 99%`)
);
assert.match(output, /start of coverage report/);
assert.match(output, /end of coverage report/);
},
});
assert(!findCoverageFileForPid(child.pid));
});
}
5 changes: 2 additions & 3 deletions test/pseudo-tty/test-set-raw-mode-modes.js
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
'use strict';
require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

function isOnlcrEnabled() {
const { stdout, stderr, status } = spawnSync('stty', ['-a'], {
const { child: { stdout } } = spawnSyncAndExitWithoutError('stty', ['-a'], {
encoding: 'utf8',
stdio: ['inherit', 'pipe', 'pipe'],
});

assert.strictEqual(status, 0, stderr);
return /(?:^|[\s;])onlcr(?:[\s;]|$)/.test(stdout);
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
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
7 changes: 3 additions & 4 deletions test/message/node_run_list.js
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
'use strict';

require('../common');
const assert = require('node:assert/strict');
const childProcess = require('node:child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const fixtures = require('../common/fixtures');

const child = childProcess.spawnSync(
const { child } = spawnSyncAndExit(
process.execPath,
[ '--no-warnings', '--run'],
{ cwd: fixtures.path('run-script'), encoding: 'utf8' },
{ status: 9, signal: null },
);
assert.strictEqual(child.status, 9);
console.log(child.stderr);
Comment thread
aduh95 marked this conversation as resolved.
4 changes: 2 additions & 2 deletions test/parallel/test-common-wpt-backends.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ const assert = require('assert');
const fs = require('fs');
const path = require('path');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const { backends, WPTRunner } = require('../common/wpt');

const queueProbe = process.env.NODE_TEST_WPT_QUEUE_PROBE === '1';
Expand DownExpand Up@@ -106,12 +107,11 @@ async function compare(throws) {
// End to end: the runner's own reporting has to match too. The webidl spec
// reports an uncaught error whose name the status file matches on.
function runDriver(driver, spec, backend) {
const { status, stdout, stderr } = spawnSync(
const { child: { stdout } } = spawnSyncAndExitWithoutError(
process.execPath,
[path.join(__dirname, '../wpt', driver), spec],
{ env: { ...process.env, WPT_BACKEND: backend }, encoding: 'utf8' },
);
assert.strictEqual(status, 0, `${spec} failed on the ${backend} backend:\n${stdout}${stderr}`);
// Specs run concurrently, so the lines arrive in an arbitrary order.
return stdout.split('\n').filter((line) => line.startsWith('[')).sort();
}
Expand Down
8 changes: 3 additions & 5 deletions test/parallel/test-fs-glob.mjs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import * as common from '../common/index.mjs';
import tmpdir from '../common/tmpdir.js';
import { spawnSync } from 'node:child_process';
import { spawnSyncAndExitWithoutError } from '../common/child_process.js';
import { resolve, dirname, sep, relative, join, isAbsolute } from 'node:path';
import { mkdir, writeFile, symlink, glob as asyncGlob } from 'node:fs/promises';
import {
Expand DownExpand Up@@ -707,12 +707,11 @@ test('glob forwards maxDepth', async () => {
});

function runNodeScript(script) {
const child = spawnSync(
const { child } = spawnSyncAndExitWithoutError(
process.execPath,
['--expose-internals', '-e', script],
{ encoding: 'utf8' },
);
assert.strictEqual(child.status, 0, child.stderr || child.stdout);
return child.stdout;
}

Expand DownExpand Up@@ -992,11 +991,10 @@ describe('glob - seen cache', function() {
`;

const seenDir = tmpdir.resolve('glob-seen');
const child = spawnSync(
spawnSyncAndExitWithoutError(
process.execPath,
['--expose-internals', '-e', script, seenDir],
{ encoding: 'utf8' },
);
assert.strictEqual(child.status, 0, child.stderr || child.stdout);
});
});
10 changes: 5 additions & 5 deletions test/parallel/test-module-unreadable-package-json.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ const assert = require('assert');
const fs = require('fs');
const path = require('path');
const { spawnSync } = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const tmpdir = require('../common/tmpdir');

tmpdir.refresh();
Expand All@@ -38,11 +39,10 @@ const entry = tmpdir.resolve('main.mjs');
fs.writeFileSync(entry, 'import { which } from "dep"; console.log(which);');

// Sanity check: the export resolves while the package config is readable.
{
const child = spawnSync(process.execPath, [entry], { encoding: 'utf8' });
assert.strictEqual(child.stdout.trim(), 'real');
assert.strictEqual(child.status, 0, child.stderr);
}
spawnSyncAndAssert(process.execPath, [entry], { encoding: 'utf8' }, {
stdout: 'real',
trim: true,
});

fs.chmodSync(depPackageJson, 0o000);

Expand Down
19 changes: 9 additions & 10 deletions test/parallel/test-runner-cli.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const { join } = require('path');
const fixtures = require('../common/fixtures');
const testFixtures = fixtures.path('test-runner');
Expand DownExpand Up@@ -70,16 +71,14 @@ for (const isolation of ['none', 'process']) {
const args = ['--test', '--test-reporter=tap',
'--no-experimental-strip-types',
`--test-isolation=${isolation}`, dir];
const child = spawnSync(process.execPath, args, { cwd: testFixtures });

assert.strictEqual(child.status, 0);
assert.strictEqual(child.signal, null);
assert.strictEqual(child.stderr.toString(), '');
const stdout = child.stdout.toString();

assert.match(stdout, /ok 1 - this should pass/);
assert.match(stdout, /ok 2 - this should pass/);
assert.match(stdout, /ok 3 - this should pass/);
spawnSyncAndAssert(process.execPath, args, { cwd: testFixtures }, {
stderr: '',
stdout(output) {
assert.match(output, /ok 1 - this should pass/);
assert.match(output, /ok 2 - this should pass/);
assert.match(output, /ok 3 - this should pass/);
},
});
}
}

Expand Down
42 changes: 20 additions & 22 deletions test/parallel/test-runner-coverage-default-exclusion.mjs
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import '../common/index.mjs';
import { before, describe, it } from 'node:test';
import assert from 'node:assert';
import { spawnSync } from 'node:child_process';
import { cp } from 'node:fs/promises';
import tmpdir from '../common/tmpdir.js';
import fixtures from '../common/fixtures.js';
import { spawnSyncAndAssert } from '../common/child_process.js';
const skipIfNoInspector = {
skip: !process.features.inspector ? 'inspector disabled' : false
};
Expand DownExpand Up@@ -57,14 +57,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--test-reporter=tap',
'--no-experimental-strip-types',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: new RegExp(RegExp.escape(report)),
});

assert.strictEqual(result.stderr.toString(), '');
assert(result.stdout.toString().includes(report));
assert.strictEqual(result.status, 0);
});

it('should exclude test files from coverage by default', async () => {
Expand All@@ -74,14 +73,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--experimental-test-coverage',
'--test-reporter=tap',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: assertDefaultExclusions,
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.strictEqual(result.status, 0);
});

it('should exclude ts test files', async () => {
Expand All@@ -91,14 +89,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--disable-warning=ExperimentalWarning',
'--test-reporter=tap',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: assertDefaultExclusions,
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.strictEqual(result.status, 0);
});

it('should exclude dotfile test files from coverage by default', async () => {
Expand All@@ -109,14 +106,15 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--test-reporter=tap',
'test/.dotfile.cjs',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout(output) {
assertDefaultExclusions(output);
assert.doesNotMatch(output, /#\s+\.dotfile\.cjs\s+\|/);
},
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.doesNotMatch(result.stdout.toString(), /#\s+\.dotfile\.cjs\s+\|/);
assert.strictEqual(result.status, 0);
});
});
26 changes: 14 additions & 12 deletions test/parallel/test-runner-coverage-thresholds.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
const common = require('../common');
const assert = require('node:assert');
const { spawnSync } = require('node:child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const { readdirSync } = require('node:fs');
const { test } = require('node:test');
const fixtures = require('../common/fixtures');
Expand DownExpand Up@@ -172,23 +173,24 @@ for (const coverage of coverages) {
});

test(`test failing ${coverage.flag} with dot reporter`, () => {
const result = spawnSync(process.execPath, [
const { child } = spawnSyncAndExit(process.execPath, [
'--test',
'--experimental-test-coverage',
'--test-coverage-exclude=!test/**',
`${coverage.flag}=99`,
'--test-reporter', 'dot',
fixture,
]);

const stdout = result.stdout.toString();
assert.match(
stdout,
RegExp(`Error: ${coverage.actual.toFixed(2)}% ${coverage.name} coverage does not meet threshold of 99%`)
);
assert.match(stdout, /start of coverage report/);
assert.match(stdout, /end of coverage report/);
assert.strictEqual(result.status, 1);
assert(!findCoverageFileForPid(result.pid));
], {
status: 1,
stdout(output) {
assert.match(
output,
RegExp(`Error: ${coverage.actual.toFixed(2)}% ${coverage.name} coverage does not meet threshold of 99%`)
);
assert.match(output, /start of coverage report/);
assert.match(output, /end of coverage report/);
},
});
assert(!findCoverageFileForPid(child.pid));
});
}
5 changes: 2 additions & 3 deletions test/pseudo-tty/test-set-raw-mode-modes.js
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
'use strict';
require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

function isOnlcrEnabled() {
const { stdout, stderr, status } = spawnSync('stty', ['-a'], {
const { child: { stdout } } = spawnSyncAndExitWithoutError('stty', ['-a'], {
encoding: 'utf8',
stdio: ['inherit', 'pipe', 'pipe'],
});

assert.strictEqual(status, 0, stderr);
return /(?:^|[\s;])onlcr(?:[\s;]|$)/.test(stdout);
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
7 changes: 3 additions & 4 deletions test/message/node_run_list.js
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
'use strict';

require('../common');
const assert = require('node:assert/strict');
const childProcess = require('node:child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const fixtures = require('../common/fixtures');

const child = childProcess.spawnSync(
const { child } = spawnSyncAndExit(
process.execPath,
[ '--no-warnings', '--run'],
{ cwd: fixtures.path('run-script'), encoding: 'utf8' },
{ status: 9, signal: null },
);
assert.strictEqual(child.status, 9);
console.log(child.stderr);
Comment thread
aduh95 marked this conversation as resolved.
4 changes: 2 additions & 2 deletions test/parallel/test-common-wpt-backends.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ const assert = require('assert');
const fs = require('fs');
const path = require('path');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const { backends, WPTRunner } = require('../common/wpt');

const queueProbe = process.env.NODE_TEST_WPT_QUEUE_PROBE === '1';
Expand DownExpand Up@@ -106,12 +107,11 @@ async function compare(throws) {
// End to end: the runner's own reporting has to match too. The webidl spec
// reports an uncaught error whose name the status file matches on.
function runDriver(driver, spec, backend) {
const { status, stdout, stderr } = spawnSync(
const { child: { stdout } } = spawnSyncAndExitWithoutError(
process.execPath,
[path.join(__dirname, '../wpt', driver), spec],
{ env: { ...process.env, WPT_BACKEND: backend }, encoding: 'utf8' },
);
assert.strictEqual(status, 0, `${spec} failed on the ${backend} backend:\n${stdout}${stderr}`);
// Specs run concurrently, so the lines arrive in an arbitrary order.
return stdout.split('\n').filter((line) => line.startsWith('[')).sort();
}
Expand Down
8 changes: 3 additions & 5 deletions test/parallel/test-fs-glob.mjs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import * as common from '../common/index.mjs';
import tmpdir from '../common/tmpdir.js';
import { spawnSync } from 'node:child_process';
import { spawnSyncAndExitWithoutError } from '../common/child_process.js';
import { resolve, dirname, sep, relative, join, isAbsolute } from 'node:path';
import { mkdir, writeFile, symlink, glob as asyncGlob } from 'node:fs/promises';
import {
Expand DownExpand Up@@ -707,12 +707,11 @@ test('glob forwards maxDepth', async () => {
});

function runNodeScript(script) {
const child = spawnSync(
const { child } = spawnSyncAndExitWithoutError(
process.execPath,
['--expose-internals', '-e', script],
{ encoding: 'utf8' },
);
assert.strictEqual(child.status, 0, child.stderr || child.stdout);
return child.stdout;
}

Expand DownExpand Up@@ -992,11 +991,10 @@ describe('glob - seen cache', function() {
`;

const seenDir = tmpdir.resolve('glob-seen');
const child = spawnSync(
spawnSyncAndExitWithoutError(
process.execPath,
['--expose-internals', '-e', script, seenDir],
{ encoding: 'utf8' },
);
assert.strictEqual(child.status, 0, child.stderr || child.stdout);
});
});
10 changes: 5 additions & 5 deletions test/parallel/test-module-unreadable-package-json.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ const assert = require('assert');
const fs = require('fs');
const path = require('path');
const { spawnSync } = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const tmpdir = require('../common/tmpdir');

tmpdir.refresh();
Expand All@@ -38,11 +39,10 @@ const entry = tmpdir.resolve('main.mjs');
fs.writeFileSync(entry, 'import { which } from "dep"; console.log(which);');

// Sanity check: the export resolves while the package config is readable.
{
const child = spawnSync(process.execPath, [entry], { encoding: 'utf8' });
assert.strictEqual(child.stdout.trim(), 'real');
assert.strictEqual(child.status, 0, child.stderr);
}
spawnSyncAndAssert(process.execPath, [entry], { encoding: 'utf8' }, {
stdout: 'real',
trim: true,
});

fs.chmodSync(depPackageJson, 0o000);

Expand Down
19 changes: 9 additions & 10 deletions test/parallel/test-runner-cli.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const { join } = require('path');
const fixtures = require('../common/fixtures');
const testFixtures = fixtures.path('test-runner');
Expand DownExpand Up@@ -70,16 +71,14 @@ for (const isolation of ['none', 'process']) {
const args = ['--test', '--test-reporter=tap',
'--no-experimental-strip-types',
`--test-isolation=${isolation}`, dir];
const child = spawnSync(process.execPath, args, { cwd: testFixtures });

assert.strictEqual(child.status, 0);
assert.strictEqual(child.signal, null);
assert.strictEqual(child.stderr.toString(), '');
const stdout = child.stdout.toString();

assert.match(stdout, /ok 1 - this should pass/);
assert.match(stdout, /ok 2 - this should pass/);
assert.match(stdout, /ok 3 - this should pass/);
spawnSyncAndAssert(process.execPath, args, { cwd: testFixtures }, {
stderr: '',
stdout(output) {
assert.match(output, /ok 1 - this should pass/);
assert.match(output, /ok 2 - this should pass/);
assert.match(output, /ok 3 - this should pass/);
},
});
}
}

Expand Down
42 changes: 20 additions & 22 deletions test/parallel/test-runner-coverage-default-exclusion.mjs
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import '../common/index.mjs';
import { before, describe, it } from 'node:test';
import assert from 'node:assert';
import { spawnSync } from 'node:child_process';
import { cp } from 'node:fs/promises';
import tmpdir from '../common/tmpdir.js';
import fixtures from '../common/fixtures.js';
import { spawnSyncAndAssert } from '../common/child_process.js';
const skipIfNoInspector = {
skip: !process.features.inspector ? 'inspector disabled' : false
};
Expand DownExpand Up@@ -57,14 +57,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--test-reporter=tap',
'--no-experimental-strip-types',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: new RegExp(RegExp.escape(report)),
});

assert.strictEqual(result.stderr.toString(), '');
assert(result.stdout.toString().includes(report));
assert.strictEqual(result.status, 0);
});

it('should exclude test files from coverage by default', async () => {
Expand All@@ -74,14 +73,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--experimental-test-coverage',
'--test-reporter=tap',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: assertDefaultExclusions,
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.strictEqual(result.status, 0);
});

it('should exclude ts test files', async () => {
Expand All@@ -91,14 +89,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--disable-warning=ExperimentalWarning',
'--test-reporter=tap',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: assertDefaultExclusions,
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.strictEqual(result.status, 0);
});

it('should exclude dotfile test files from coverage by default', async () => {
Expand All@@ -109,14 +106,15 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--test-reporter=tap',
'test/.dotfile.cjs',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout(output) {
assertDefaultExclusions(output);
assert.doesNotMatch(output, /#\s+\.dotfile\.cjs\s+\|/);
},
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.doesNotMatch(result.stdout.toString(), /#\s+\.dotfile\.cjs\s+\|/);
assert.strictEqual(result.status, 0);
});
});
26 changes: 14 additions & 12 deletions test/parallel/test-runner-coverage-thresholds.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
const common = require('../common');
const assert = require('node:assert');
const { spawnSync } = require('node:child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const { readdirSync } = require('node:fs');
const { test } = require('node:test');
const fixtures = require('../common/fixtures');
Expand DownExpand Up@@ -172,23 +173,24 @@ for (const coverage of coverages) {
});

test(`test failing ${coverage.flag} with dot reporter`, () => {
const result = spawnSync(process.execPath, [
const { child } = spawnSyncAndExit(process.execPath, [
'--test',
'--experimental-test-coverage',
'--test-coverage-exclude=!test/**',
`${coverage.flag}=99`,
'--test-reporter', 'dot',
fixture,
]);

const stdout = result.stdout.toString();
assert.match(
stdout,
RegExp(`Error: ${coverage.actual.toFixed(2)}% ${coverage.name} coverage does not meet threshold of 99%`)
);
assert.match(stdout, /start of coverage report/);
assert.match(stdout, /end of coverage report/);
assert.strictEqual(result.status, 1);
assert(!findCoverageFileForPid(result.pid));
], {
status: 1,
stdout(output) {
assert.match(
output,
RegExp(`Error: ${coverage.actual.toFixed(2)}% ${coverage.name} coverage does not meet threshold of 99%`)
);
assert.match(output, /start of coverage report/);
assert.match(output, /end of coverage report/);
},
});
assert(!findCoverageFileForPid(child.pid));
});
}
5 changes: 2 additions & 3 deletions test/pseudo-tty/test-set-raw-mode-modes.js
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
'use strict';
require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

function isOnlcrEnabled() {
const { stdout, stderr, status } = spawnSync('stty', ['-a'], {
const { child: { stdout } } = spawnSyncAndExitWithoutError('stty', ['-a'], {
encoding: 'utf8',
stdio: ['inherit', 'pipe', 'pipe'],
});

assert.strictEqual(status, 0, stderr);
return /(?:^|[\s;])onlcr(?:[\s;]|$)/.test(stdout);
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
7 changes: 3 additions & 4 deletions test/message/node_run_list.js
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
'use strict';

require('../common');
const assert = require('node:assert/strict');
const childProcess = require('node:child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const fixtures = require('../common/fixtures');

const child = childProcess.spawnSync(
const { child } = spawnSyncAndExit(
process.execPath,
[ '--no-warnings', '--run'],
{ cwd: fixtures.path('run-script'), encoding: 'utf8' },
{ status: 9, signal: null },
);
assert.strictEqual(child.status, 9);
console.log(child.stderr);
Comment thread
aduh95 marked this conversation as resolved.
4 changes: 2 additions & 2 deletions test/parallel/test-common-wpt-backends.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ const assert = require('assert');
const fs = require('fs');
const path = require('path');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const { backends, WPTRunner } = require('../common/wpt');

const queueProbe = process.env.NODE_TEST_WPT_QUEUE_PROBE === '1';
Expand DownExpand Up@@ -106,12 +107,11 @@ async function compare(throws) {
// End to end: the runner's own reporting has to match too. The webidl spec
// reports an uncaught error whose name the status file matches on.
function runDriver(driver, spec, backend) {
const { status, stdout, stderr } = spawnSync(
const { child: { stdout } } = spawnSyncAndExitWithoutError(
process.execPath,
[path.join(__dirname, '../wpt', driver), spec],
{ env: { ...process.env, WPT_BACKEND: backend }, encoding: 'utf8' },
);
assert.strictEqual(status, 0, `${spec} failed on the ${backend} backend:\n${stdout}${stderr}`);
// Specs run concurrently, so the lines arrive in an arbitrary order.
return stdout.split('\n').filter((line) => line.startsWith('[')).sort();
}
Expand Down
8 changes: 3 additions & 5 deletions test/parallel/test-fs-glob.mjs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import * as common from '../common/index.mjs';
import tmpdir from '../common/tmpdir.js';
import { spawnSync } from 'node:child_process';
import { spawnSyncAndExitWithoutError } from '../common/child_process.js';
import { resolve, dirname, sep, relative, join, isAbsolute } from 'node:path';
import { mkdir, writeFile, symlink, glob as asyncGlob } from 'node:fs/promises';
import {
Expand DownExpand Up@@ -707,12 +707,11 @@ test('glob forwards maxDepth', async () => {
});

function runNodeScript(script) {
const child = spawnSync(
const { child } = spawnSyncAndExitWithoutError(
process.execPath,
['--expose-internals', '-e', script],
{ encoding: 'utf8' },
);
assert.strictEqual(child.status, 0, child.stderr || child.stdout);
return child.stdout;
}

Expand DownExpand Up@@ -992,11 +991,10 @@ describe('glob - seen cache', function() {
`;

const seenDir = tmpdir.resolve('glob-seen');
const child = spawnSync(
spawnSyncAndExitWithoutError(
process.execPath,
['--expose-internals', '-e', script, seenDir],
{ encoding: 'utf8' },
);
assert.strictEqual(child.status, 0, child.stderr || child.stdout);
});
});
10 changes: 5 additions & 5 deletions test/parallel/test-module-unreadable-package-json.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ const assert = require('assert');
const fs = require('fs');
const path = require('path');
const { spawnSync } = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const tmpdir = require('../common/tmpdir');

tmpdir.refresh();
Expand All@@ -38,11 +39,10 @@ const entry = tmpdir.resolve('main.mjs');
fs.writeFileSync(entry, 'import { which } from "dep"; console.log(which);');

// Sanity check: the export resolves while the package config is readable.
{
const child = spawnSync(process.execPath, [entry], { encoding: 'utf8' });
assert.strictEqual(child.stdout.trim(), 'real');
assert.strictEqual(child.status, 0, child.stderr);
}
spawnSyncAndAssert(process.execPath, [entry], { encoding: 'utf8' }, {
stdout: 'real',
trim: true,
});

fs.chmodSync(depPackageJson, 0o000);

Expand Down
19 changes: 9 additions & 10 deletions test/parallel/test-runner-cli.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const { join } = require('path');
const fixtures = require('../common/fixtures');
const testFixtures = fixtures.path('test-runner');
Expand DownExpand Up@@ -70,16 +71,14 @@ for (const isolation of ['none', 'process']) {
const args = ['--test', '--test-reporter=tap',
'--no-experimental-strip-types',
`--test-isolation=${isolation}`, dir];
const child = spawnSync(process.execPath, args, { cwd: testFixtures });

assert.strictEqual(child.status, 0);
assert.strictEqual(child.signal, null);
assert.strictEqual(child.stderr.toString(), '');
const stdout = child.stdout.toString();

assert.match(stdout, /ok 1 - this should pass/);
assert.match(stdout, /ok 2 - this should pass/);
assert.match(stdout, /ok 3 - this should pass/);
spawnSyncAndAssert(process.execPath, args, { cwd: testFixtures }, {
stderr: '',
stdout(output) {
assert.match(output, /ok 1 - this should pass/);
assert.match(output, /ok 2 - this should pass/);
assert.match(output, /ok 3 - this should pass/);
},
});
}
}

Expand Down
42 changes: 20 additions & 22 deletions test/parallel/test-runner-coverage-default-exclusion.mjs
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import '../common/index.mjs';
import { before, describe, it } from 'node:test';
import assert from 'node:assert';
import { spawnSync } from 'node:child_process';
import { cp } from 'node:fs/promises';
import tmpdir from '../common/tmpdir.js';
import fixtures from '../common/fixtures.js';
import { spawnSyncAndAssert } from '../common/child_process.js';
const skipIfNoInspector = {
skip: !process.features.inspector ? 'inspector disabled' : false
};
Expand DownExpand Up@@ -57,14 +57,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--test-reporter=tap',
'--no-experimental-strip-types',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: new RegExp(RegExp.escape(report)),
});

assert.strictEqual(result.stderr.toString(), '');
assert(result.stdout.toString().includes(report));
assert.strictEqual(result.status, 0);
});

it('should exclude test files from coverage by default', async () => {
Expand All@@ -74,14 +73,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--experimental-test-coverage',
'--test-reporter=tap',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: assertDefaultExclusions,
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.strictEqual(result.status, 0);
});

it('should exclude ts test files', async () => {
Expand All@@ -91,14 +89,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--disable-warning=ExperimentalWarning',
'--test-reporter=tap',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: assertDefaultExclusions,
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.strictEqual(result.status, 0);
});

it('should exclude dotfile test files from coverage by default', async () => {
Expand All@@ -109,14 +106,15 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--test-reporter=tap',
'test/.dotfile.cjs',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout(output) {
assertDefaultExclusions(output);
assert.doesNotMatch(output, /#\s+\.dotfile\.cjs\s+\|/);
},
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.doesNotMatch(result.stdout.toString(), /#\s+\.dotfile\.cjs\s+\|/);
assert.strictEqual(result.status, 0);
});
});
26 changes: 14 additions & 12 deletions test/parallel/test-runner-coverage-thresholds.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
const common = require('../common');
const assert = require('node:assert');
const { spawnSync } = require('node:child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const { readdirSync } = require('node:fs');
const { test } = require('node:test');
const fixtures = require('../common/fixtures');
Expand DownExpand Up@@ -172,23 +173,24 @@ for (const coverage of coverages) {
});

test(`test failing ${coverage.flag} with dot reporter`, () => {
const result = spawnSync(process.execPath, [
const { child } = spawnSyncAndExit(process.execPath, [
'--test',
'--experimental-test-coverage',
'--test-coverage-exclude=!test/**',
`${coverage.flag}=99`,
'--test-reporter', 'dot',
fixture,
]);

const stdout = result.stdout.toString();
assert.match(
stdout,
RegExp(`Error: ${coverage.actual.toFixed(2)}% ${coverage.name} coverage does not meet threshold of 99%`)
);
assert.match(stdout, /start of coverage report/);
assert.match(stdout, /end of coverage report/);
assert.strictEqual(result.status, 1);
assert(!findCoverageFileForPid(result.pid));
], {
status: 1,
stdout(output) {
assert.match(
output,
RegExp(`Error: ${coverage.actual.toFixed(2)}% ${coverage.name} coverage does not meet threshold of 99%`)
);
assert.match(output, /start of coverage report/);
assert.match(output, /end of coverage report/);
},
});
assert(!findCoverageFileForPid(child.pid));
});
}
5 changes: 2 additions & 3 deletions test/pseudo-tty/test-set-raw-mode-modes.js
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
'use strict';
require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

function isOnlcrEnabled() {
const { stdout, stderr, status } = spawnSync('stty', ['-a'], {
const { child: { stdout } } = spawnSyncAndExitWithoutError('stty', ['-a'], {
encoding: 'utf8',
stdio: ['inherit', 'pipe', 'pipe'],
});

assert.strictEqual(status, 0, stderr);
return /(?:^|[\s;])onlcr(?:[\s;]|$)/.test(stdout);
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
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
7 changes: 3 additions & 4 deletions test/message/node_run_list.js
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
'use strict';

require('../common');
const assert = require('node:assert/strict');
const childProcess = require('node:child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const fixtures = require('../common/fixtures');

const child = childProcess.spawnSync(
const { child } = spawnSyncAndExit(
process.execPath,
[ '--no-warnings', '--run'],
{ cwd: fixtures.path('run-script'), encoding: 'utf8' },
{ status: 9, signal: null },
);
assert.strictEqual(child.status, 9);
console.log(child.stderr);
Comment thread
aduh95 marked this conversation as resolved.
4 changes: 2 additions & 2 deletions test/parallel/test-common-wpt-backends.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ const assert = require('assert');
const fs = require('fs');
const path = require('path');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');
const { backends, WPTRunner } = require('../common/wpt');

const queueProbe = process.env.NODE_TEST_WPT_QUEUE_PROBE === '1';
Expand DownExpand Up@@ -106,12 +107,11 @@ async function compare(throws) {
// End to end: the runner's own reporting has to match too. The webidl spec
// reports an uncaught error whose name the status file matches on.
function runDriver(driver, spec, backend) {
const { status, stdout, stderr } = spawnSync(
const { child: { stdout } } = spawnSyncAndExitWithoutError(
process.execPath,
[path.join(__dirname, '../wpt', driver), spec],
{ env: { ...process.env, WPT_BACKEND: backend }, encoding: 'utf8' },
);
assert.strictEqual(status, 0, `${spec} failed on the ${backend} backend:\n${stdout}${stderr}`);
// Specs run concurrently, so the lines arrive in an arbitrary order.
return stdout.split('\n').filter((line) => line.startsWith('[')).sort();
}
Expand Down
8 changes: 3 additions & 5 deletions test/parallel/test-fs-glob.mjs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import * as common from '../common/index.mjs';
import tmpdir from '../common/tmpdir.js';
import { spawnSync } from 'node:child_process';
import { spawnSyncAndExitWithoutError } from '../common/child_process.js';
import { resolve, dirname, sep, relative, join, isAbsolute } from 'node:path';
import { mkdir, writeFile, symlink, glob as asyncGlob } from 'node:fs/promises';
import {
Expand DownExpand Up@@ -707,12 +707,11 @@ test('glob forwards maxDepth', async () => {
});

function runNodeScript(script) {
const child = spawnSync(
const { child } = spawnSyncAndExitWithoutError(
process.execPath,
['--expose-internals', '-e', script],
{ encoding: 'utf8' },
);
assert.strictEqual(child.status, 0, child.stderr || child.stdout);
return child.stdout;
}

Expand DownExpand Up@@ -992,11 +991,10 @@ describe('glob - seen cache', function() {
`;

const seenDir = tmpdir.resolve('glob-seen');
const child = spawnSync(
spawnSyncAndExitWithoutError(
process.execPath,
['--expose-internals', '-e', script, seenDir],
{ encoding: 'utf8' },
);
assert.strictEqual(child.status, 0, child.stderr || child.stdout);
});
});
10 changes: 5 additions & 5 deletions test/parallel/test-module-unreadable-package-json.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ const assert = require('assert');
const fs = require('fs');
const path = require('path');
const { spawnSync } = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const tmpdir = require('../common/tmpdir');

tmpdir.refresh();
Expand All@@ -38,11 +39,10 @@ const entry = tmpdir.resolve('main.mjs');
fs.writeFileSync(entry, 'import { which } from "dep"; console.log(which);');

// Sanity check: the export resolves while the package config is readable.
{
const child = spawnSync(process.execPath, [entry], { encoding: 'utf8' });
assert.strictEqual(child.stdout.trim(), 'real');
assert.strictEqual(child.status, 0, child.stderr);
}
spawnSyncAndAssert(process.execPath, [entry], { encoding: 'utf8' }, {
stdout: 'real',
trim: true,
});

fs.chmodSync(depPackageJson, 0o000);

Expand Down
19 changes: 9 additions & 10 deletions test/parallel/test-runner-cli.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { spawnSyncAndAssert } = require('../common/child_process');
const { join } = require('path');
const fixtures = require('../common/fixtures');
const testFixtures = fixtures.path('test-runner');
Expand DownExpand Up@@ -70,16 +71,14 @@ for (const isolation of ['none', 'process']) {
const args = ['--test', '--test-reporter=tap',
'--no-experimental-strip-types',
`--test-isolation=${isolation}`, dir];
const child = spawnSync(process.execPath, args, { cwd: testFixtures });

assert.strictEqual(child.status, 0);
assert.strictEqual(child.signal, null);
assert.strictEqual(child.stderr.toString(), '');
const stdout = child.stdout.toString();

assert.match(stdout, /ok 1 - this should pass/);
assert.match(stdout, /ok 2 - this should pass/);
assert.match(stdout, /ok 3 - this should pass/);
spawnSyncAndAssert(process.execPath, args, { cwd: testFixtures }, {
stderr: '',
stdout(output) {
assert.match(output, /ok 1 - this should pass/);
assert.match(output, /ok 2 - this should pass/);
assert.match(output, /ok 3 - this should pass/);
},
});
}
}

Expand Down
42 changes: 20 additions & 22 deletions test/parallel/test-runner-coverage-default-exclusion.mjs
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import '../common/index.mjs';
import { before, describe, it } from 'node:test';
import assert from 'node:assert';
import { spawnSync } from 'node:child_process';
import { cp } from 'node:fs/promises';
import tmpdir from '../common/tmpdir.js';
import fixtures from '../common/fixtures.js';
import { spawnSyncAndAssert } from '../common/child_process.js';
const skipIfNoInspector = {
skip: !process.features.inspector ? 'inspector disabled' : false
};
Expand DownExpand Up@@ -57,14 +57,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--test-reporter=tap',
'--no-experimental-strip-types',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: new RegExp(RegExp.escape(report)),
});

assert.strictEqual(result.stderr.toString(), '');
assert(result.stdout.toString().includes(report));
assert.strictEqual(result.status, 0);
});

it('should exclude test files from coverage by default', async () => {
Expand All@@ -74,14 +73,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--experimental-test-coverage',
'--test-reporter=tap',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: assertDefaultExclusions,
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.strictEqual(result.status, 0);
});

it('should exclude ts test files', async () => {
Expand All@@ -91,14 +89,13 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--disable-warning=ExperimentalWarning',
'--test-reporter=tap',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout: assertDefaultExclusions,
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.strictEqual(result.status, 0);
});

it('should exclude dotfile test files from coverage by default', async () => {
Expand All@@ -109,14 +106,15 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
'--test-reporter=tap',
'test/.dotfile.cjs',
];
const result = spawnSync(process.execPath, args, {
spawnSyncAndAssert(process.execPath, args, {
env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path },
cwd: tmpdir.path
}, {
stderr: '',
stdout(output) {
assertDefaultExclusions(output);
assert.doesNotMatch(output, /#\s+\.dotfile\.cjs\s+\|/);
},
});

assert.strictEqual(result.stderr.toString(), '');
assertDefaultExclusions(result.stdout.toString());
assert.doesNotMatch(result.stdout.toString(), /#\s+\.dotfile\.cjs\s+\|/);
assert.strictEqual(result.status, 0);
});
});
26 changes: 14 additions & 12 deletions test/parallel/test-runner-coverage-thresholds.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
const common = require('../common');
const assert = require('node:assert');
const { spawnSync } = require('node:child_process');
const { spawnSyncAndExit } = require('../common/child_process');
const { readdirSync } = require('node:fs');
const { test } = require('node:test');
const fixtures = require('../common/fixtures');
Expand DownExpand Up@@ -172,23 +173,24 @@ for (const coverage of coverages) {
});

test(`test failing ${coverage.flag} with dot reporter`, () => {
const result = spawnSync(process.execPath, [
const { child } = spawnSyncAndExit(process.execPath, [
'--test',
'--experimental-test-coverage',
'--test-coverage-exclude=!test/**',
`${coverage.flag}=99`,
'--test-reporter', 'dot',
fixture,
]);

const stdout = result.stdout.toString();
assert.match(
stdout,
RegExp(`Error: ${coverage.actual.toFixed(2)}% ${coverage.name} coverage does not meet threshold of 99%`)
);
assert.match(stdout, /start of coverage report/);
assert.match(stdout, /end of coverage report/);
assert.strictEqual(result.status, 1);
assert(!findCoverageFileForPid(result.pid));
], {
status: 1,
stdout(output) {
assert.match(
output,
RegExp(`Error: ${coverage.actual.toFixed(2)}% ${coverage.name} coverage does not meet threshold of 99%`)
);
assert.match(output, /start of coverage report/);
assert.match(output, /end of coverage report/);
},
});
assert(!findCoverageFileForPid(child.pid));
});
}
5 changes: 2 additions & 3 deletions test/pseudo-tty/test-set-raw-mode-modes.js
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
'use strict';
require('../common');
const assert = require('assert');
const { spawnSync } = require('child_process');
const { spawnSyncAndExitWithoutError } = require('../common/child_process');

function isOnlcrEnabled() {
const { stdout, stderr, status } = spawnSync('stty', ['-a'], {
const { child: { stdout } } = spawnSyncAndExitWithoutError('stty', ['-a'], {
encoding: 'utf8',
stdio: ['inherit', 'pipe', 'pipe'],
});

assert.strictEqual(status, 0, stderr);
return /(?:^|[\s;])onlcr(?:[\s;]|$)/.test(stdout);
}

Expand Down
Loading