test: fix regex to account to path containing white spaces

nodejs · Jul 29, 2023 · 6e05e8d · 6e05e8d
1 parent 8526791
commit 6e05e8d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/test/common/assertSnapshot.js b/test/common/assertSnapshot.js
@@ -5,7 +5,7 @@ const test = require('node:test');
 const fs = require('node:fs/promises');
 const assert = require('node:assert/strict');
 
-const stackFramesRegexp = /(\s+)((.+?)\s+\()?(?:\(?(.+?):(\d+)(?::(\d+))?)\)?(\s+\{)?(\[\d+m)?(\n|$)/g;
+const stackFramesRegexp = /(?<=\n)(\s+)((.+?)\s+\()?(?:\(?(.+?):(\d+)(?::(\d+))?)\)?(\s+\{)?(\[\d+m)?(\n|$)/g;
 const windowNewlineRegexp = /\r/g;
 
 function replaceStackTrace(str, replacement = '$1*$7$8\n') {

diff --git a/test/parallel/test-node-output-errors.mjs b/test/parallel/test-node-output-errors.mjs
@@ -21,7 +21,13 @@ function replaceStackTrace(str) {
 
 describe('errors output', { concurrency: true }, () => {
   function normalize(str) {
-    return str.replaceAll(snapshot.replaceWindowsPaths(process.cwd()), '').replaceAll(pathToFileURL(process.cwd()).pathname, '').replaceAll('//', '*').replaceAll(/\/(\w)/g, '*$1').replaceAll('*test*', '*').replaceAll('*fixtures*errors*', '*').replaceAll('file:**', 'file:*/');
+    return str.replaceAll(snapshot.replaceWindowsPaths(process.cwd()), '')
+      .replaceAll(pathToFileURL(process.cwd()).pathname, '')
+      .replaceAll('//', '*')
+      .replaceAll(/\/(\w)/g, '*$1')
+      .replaceAll('*test*', '*')
+      .replaceAll('*fixtures*errors*', '*')
+      .replaceAll('file:**', 'file:*/');
   }
 
   function normalizeNoNumbers(str) {
@@ -51,11 +57,11 @@ describe('errors output', { concurrency: true }, () => {
     { name: 'errors/throw_in_line_with_tabs.js', transform: errTransform },
     { name: 'errors/throw_non_error.js', transform: errTransform },
     { name: 'errors/promise_always_throw_unhandled.js', transform: promiseTransform },
-    !skipForceColors ? { name: 'errors/force_colors.js', env: { FORCE_COLOR: 1 } } : null,
-  ].filter(Boolean);
-  for (const { name, transform, env } of tests) {
-    it(name, async () => {
-      await snapshot.spawnAndAssert(fixtures.path(name), transform ?? defaultTransform, { env });
+    { skip: skipForceColors, name: 'errors/force_colors.js', env: { FORCE_COLOR: 1 } },
+  ];
+  for (const { name, transform = defaultTransform, env, skip = false } of tests) {
+    it(name, { skip }, async () => {
+      await snapshot.spawnAndAssert(fixtures.path(name), transform, { env });
     });
   }
 });