FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

test: fix edge snapshot stack traces · nodejs/node@00c0853 · GitHub

/ node Public

Commit 00c0853

Browse files
GeoffreyBooth
authored and
targos
committed
test: fix edge snapshot stack traces
PR-URL: #49659 Backport-PR-URL: #50669 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
1 parent 48f6d9a commit 00c0853

4 files changed

Lines changed: 28 additions & 20 deletions

File tree

‎test/common/assertSnapshot.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ const assert = require('node:assert/strict');
88
const stackFramesRegexp = /(?<=\n)(\s+)((.+?)\s+\()?(?:\(?(.+?):(\d+)(?::(\d+))?)\)?(\s+\{)?(\[\d+m)?(\n|$)/g;
99
const windowNewlineRegexp = /\r/g;
1010

11+
function replaceNodeVersion(str) {
12+
return str.replaceAll(process.version, '*');
13+
}
14+
1115
function replaceStackTrace(str, replacement = '$1*$7$8\n') {
1216
return str.replace(stackFramesRegexp, replacement);
1317
}
@@ -69,6 +73,7 @@ async function spawnAndAssert(filename, transform = (x) => x, { tty = false, ...
6973
module.exports = {
7074
assertSnapshot,
7175
getSnapshotPath,
76+
replaceNodeVersion,
7277
replaceStackTrace,
7378
replaceWindowsLineEndings,
7479
replaceWindowsPaths,

‎test/fixtures/errors/force_colors.snapshot‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ throw new Error('Should include grayed stack trace')
44

55
Error: Should include grayed stack trace
66
at Object.<anonymous> (/test*force_colors.js:1:7)
7-
 at Module._compile (node:internal*modules*cjs*loader:1356:14)
8-
 at Module._extensions..js (node:internal*modules*cjs*loader:1414:10)
9-
 at Module.load (node:internal*modules*cjs*loader:1197:32)
10-
 at Module._load (node:internal*modules*cjs*loader:1013:12)
11-
 at Function.executeUserEntryPoint [as runMain] (node:internal*modules*run_main:128:12)
12-
 at node:internal*main*run_main_module:28:49
7+
 at *
8+
 at *
9+
 at *
10+
 at *
11+
 at *
12+
 at *
1313

1414
Node.js *

‎test/parallel/test-node-output-errors.mjs‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ const skipForceColors =
1111
(common.isWindows && (Number(os.release().split('.')[0]) !== 10 || Number(os.release().split('.')[2]) < 14393)); // See https://github.com/nodejs/node/pull/33132
1212

1313

14-
function replaceNodeVersion(str) {
15-
return str.replaceAll(process.version, '*');
16-
}
17-
1814
function replaceStackTrace(str) {
1915
return snapshot.replaceStackTrace(str, '$1at *$7\n');
2016
}
2117

18+
function replaceForceColorsStackTrace(str) {
19+
// eslint-disable-next-line no-control-regex
20+
return str.replaceAll(/(\[90m\W+)at .*node:.*/g, '$1at *');
21+
}
22+
2223
describe('errors output', { concurrency: true }, () => {
2324
function normalize(str) {
2425
return str.replaceAll(snapshot.replaceWindowsPaths(process.cwd()), '')
@@ -35,9 +36,12 @@ describe('errors output', { concurrency: true }, () => {
3536
}
3637
const common = snapshot
3738
.transform(snapshot.replaceWindowsLineEndings, snapshot.replaceWindowsPaths);
38-
const defaultTransform = snapshot.transform(common, normalize, replaceNodeVersion);
39-
const errTransform = snapshot.transform(common, normalizeNoNumbers, replaceNodeVersion);
40-
const promiseTransform = snapshot.transform(common, replaceStackTrace, normalizeNoNumbers, replaceNodeVersion);
39+
const defaultTransform = snapshot.transform(common, normalize, snapshot.replaceNodeVersion);
40+
const errTransform = snapshot.transform(common, normalizeNoNumbers, snapshot.replaceNodeVersion);
41+
const promiseTransform = snapshot.transform(common, replaceStackTrace,
42+
normalizeNoNumbers, snapshot.replaceNodeVersion);
43+
const forceColorsTransform = snapshot.transform(common, normalize,
44+
replaceForceColorsStackTrace, snapshot.replaceNodeVersion);
4145

4246
const tests = [
4347
{ name: 'errors/async_error_eval_cjs.js' },
@@ -57,7 +61,8 @@ describe('errors output', { concurrency: true }, () => {
5761
{ name: 'errors/throw_in_line_with_tabs.js', transform: errTransform },
5862
{ name: 'errors/throw_non_error.js', transform: errTransform },
5963
{ name: 'errors/promise_always_throw_unhandled.js', transform: promiseTransform },
60-
{ skip: skipForceColors, name: 'errors/force_colors.js', env: { FORCE_COLOR: 1 } },
64+
{ skip: skipForceColors, name: 'errors/force_colors.js',
65+
transform: forceColorsTransform, env: { FORCE_COLOR: 1 } },
6166
];
6267
for (const { name, transform = defaultTransform, env, skip = false } of tests) {
6368
it(name, { skip }, async () => {

‎test/parallel/test-node-output-sourcemaps.mjs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ import * as snapshot from '../common/assertSnapshot.js';
44
import * as path from 'node:path';
55
import { describe, it } from 'node:test';
66

7-
function replaceNodeVersion(str) {
8-
return str.replaceAll(process.version, '*');
9-
}
10-
117
describe('sourcemaps output', { concurrency: true }, () => {
128
function normalize(str) {
139
const result = str
@@ -16,7 +12,8 @@ describe('sourcemaps output', { concurrency: true }, () => {
1612
.replaceAll('/Users/bencoe/oss/coffee-script-test', '')
1713
.replaceAll(/\/(\w)/g, '*$1')
1814
.replaceAll('*test*', '*')
19-
.replaceAll('*fixtures*source-map*', '*');
15+
.replaceAll('*fixtures*source-map*', '*')
16+
.replaceAll(/(\W+).*node:internal\*modules.*/g, '$1*');
2017
if (common.isWindows) {
2118
const currentDeviceLetter = path.parse(process.cwd()).root.substring(0, 1).toLowerCase();
2219
const regex = new RegExp(`${currentDeviceLetter}:/?`, 'gi');
@@ -25,7 +22,8 @@ describe('sourcemaps output', { concurrency: true }, () => {
2522
return result;
2623
}
2724
const defaultTransform = snapshot
28-
.transform(snapshot.replaceWindowsLineEndings, snapshot.replaceWindowsPaths, normalize, replaceNodeVersion);
25+
.transform(snapshot.replaceWindowsLineEndings, snapshot.replaceWindowsPaths,
26+
normalize, snapshot.replaceNodeVersion);
2927

3028
const tests = [
3129
{ name: 'source-map/output/source_map_disabled_by_api.js' },

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL