test: fix output tests when path includes node version

MoLow · MoLow · commit 1b84e8557697 · 2023-07-07T00:06:11.000+03:00
PR-URL: #47843 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
diff --git a/test/parallel/test-node-output-console.mjs b/test/parallel/test-node-output-console.mjs
@@ -3,17 +3,14 @@ import * as fixtures from '../common/fixtures.mjs';
 import * as snapshot from '../common/assertSnapshot.js';
 import { describe, it } from 'node:test';
 
-function replaceNodeVersion(str) {
- return str.replaceAll(process.version, '*');
-}
 
 function replaceStackTrace(str) {
 return snapshot.replaceStackTrace(str, '$1at *$7\n');
 }
 
 describe('console output', { concurrency: true }, () => {
- function stackTrace(str) {
- return str.replaceAll(snapshot.replaceWindowsPaths(process.cwd()), '').replaceAll('/', '*').replaceAll(/\d+/g, '*');
+ function normalize(str) {
+ return str.replaceAll(snapshot.replaceWindowsPaths(process.cwd()), '').replaceAll('/', '*').replaceAll(process.version, '*').replaceAll(/\d+/g, '*');
 }
 const tests = [
 { name: 'console/2100bytes.js' },
@@ -23,7 +20,7 @@ describe('console output', { concurrency: true }, () => {
 {
 name: 'console/stack_overflow.js',
 transform: snapshot
- .transform(snapshot.replaceWindowsLineEndings, snapshot.replaceWindowsPaths, replaceNodeVersion, stackTrace)
+ .transform(snapshot.replaceWindowsLineEndings, snapshot.replaceWindowsPaths, normalize)
 },
 ];
 const defaultTransform = snapshot
diff --git a/test/parallel/test-node-output-errors.mjs b/test/parallel/test-node-output-errors.mjs
@@ -20,10 +20,10 @@ describe('errors output', { concurrency: true }, () => {
 return normalize(str).replaceAll(/\d+:\d+/g, '*:*').replaceAll(/:\d+/g, ':*').replaceAll('*fixtures*message*', '*');
 }
 const common = snapshot
- .transform(snapshot.replaceWindowsLineEndings, snapshot.replaceWindowsPaths, replaceNodeVersion);
- const defaultTransform = snapshot.transform(common, normalize);
- const errTransform = snapshot.transform(common, normalizeNoNumbers);
- const promiseTransform = snapshot.transform(common, replaceStackTrace, normalizeNoNumbers);
+ .transform(snapshot.replaceWindowsLineEndings, snapshot.replaceWindowsPaths);
+ const defaultTransform = snapshot.transform(common, normalize, replaceNodeVersion);
+ const errTransform = snapshot.transform(common, normalizeNoNumbers, replaceNodeVersion);
+ const promiseTransform = snapshot.transform(common, replaceStackTrace, normalizeNoNumbers, replaceNodeVersion);
 
 const tests = [
 { name: 'errors/async_error_eval_cjs.js' },
diff --git a/test/parallel/test-node-output-sourcemaps.mjs b/test/parallel/test-node-output-sourcemaps.mjs
@@ -25,7 +25,7 @@ describe('sourcemaps output', { concurrency: true }, () => {
 return result;
 }
 const defaultTransform = snapshot
- .transform(snapshot.replaceWindowsLineEndings, snapshot.replaceWindowsPaths, replaceNodeVersion, normalize);
+ .transform(snapshot.replaceWindowsLineEndings, snapshot.replaceWindowsPaths, normalize, replaceNodeVersion);
 
 const tests = [
 { name: 'source-map/output/source_map_disabled_by_api.js' },
diff --git a/test/parallel/test-node-output-vm.mjs b/test/parallel/test-node-output-vm.mjs
@@ -13,7 +13,7 @@ describe('vm output', { concurrency: true }, () => {
 }
 
 const defaultTransform = snapshot
- .transform(snapshot.replaceWindowsLineEndings, snapshot.replaceWindowsPaths, replaceNodeVersion, normalize);
+ .transform(snapshot.replaceWindowsLineEndings, snapshot.replaceWindowsPaths, normalize, replaceNodeVersion);
 
 const tests = [
 { name: 'vm/vm_caught_custom_runtime_error.js' },

-Original file line number
+Diff line change
 import*assnapshotfrom'../common/assertSnapshot.js';
 import{describe,it}from'node:test';
 -functionreplaceNodeVersion(str){
 -returnstr.replaceAll(process.version,'*');
 -}
 functionreplaceStackTrace(str){
 returnsnapshot.replaceStackTrace(str,'$1at *$7\n');
+}
 describe('console output',{concurrency: true},()=>{
 -functionstackTrace(str){
 -returnstr.replaceAll(snapshot.replaceWindowsPaths(process.cwd()),'').replaceAll('/','*').replaceAll(/\d+/g,'*');
 +functionnormalize(str){
 +returnstr.replaceAll(snapshot.replaceWindowsPaths(process.cwd()),'').replaceAll('/','*').replaceAll(process.version,'*').replaceAll(/\d+/g,'*');
+}
 consttests=[
 {name: 'console/2100bytes.js'},
+{
 name: 'console/stack_overflow.js',
 transform: snapshot
 -.transform(snapshot.replaceWindowsLineEndings,snapshot.replaceWindowsPaths,replaceNodeVersion,stackTrace)
 +.transform(snapshot.replaceWindowsLineEndings,snapshot.replaceWindowsPaths,normalize)
 },
 ];
 constdefaultTransform=snapshot
-Original file line number
+Diff line change
 returnnormalize(str).replaceAll(/\d+:\d+/g,'*:*').replaceAll(/:\d+/g,':*').replaceAll('*fixtures*message*','*');
+}
 constcommon=snapshot
 -.transform(snapshot.replaceWindowsLineEndings,snapshot.replaceWindowsPaths,replaceNodeVersion);
 -constdefaultTransform=snapshot.transform(common,normalize);
 -consterrTransform=snapshot.transform(common,normalizeNoNumbers);
 -constpromiseTransform=snapshot.transform(common,replaceStackTrace,normalizeNoNumbers);
 +.transform(snapshot.replaceWindowsLineEndings,snapshot.replaceWindowsPaths);
 +constdefaultTransform=snapshot.transform(common,normalize,replaceNodeVersion);
 +consterrTransform=snapshot.transform(common,normalizeNoNumbers,replaceNodeVersion);
 +constpromiseTransform=snapshot.transform(common,replaceStackTrace,normalizeNoNumbers,replaceNodeVersion);
 consttests=[
 {name: 'errors/async_error_eval_cjs.js'},
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ describe('sourcemaps output', { concurrency: true }, () => {`
`25`	`25`	`returnresult;`
`26`	`26`	`}`
`27`	`27`	`constdefaultTransform=snapshot`
`28`		`-.transform(snapshot.replaceWindowsLineEndings,snapshot.replaceWindowsPaths,replaceNodeVersion,normalize);`
	`28`	`+.transform(snapshot.replaceWindowsLineEndings,snapshot.replaceWindowsPaths,normalize,replaceNodeVersion);`
`29`	`29`
`30`	`30`	`consttests=[`
`31`	`31`	`{name: 'source-map/output/source_map_disabled_by_api.js'},`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ describe('vm output', { concurrency: true }, () => {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`constdefaultTransform=snapshot`
`16`		`-.transform(snapshot.replaceWindowsLineEndings,snapshot.replaceWindowsPaths,replaceNodeVersion,normalize);`
	`16`	`+.transform(snapshot.replaceWindowsLineEndings,snapshot.replaceWindowsPaths,normalize,replaceNodeVersion);`
`17`	`17`
`18`	`18`	`consttests=[`
`19`	`19`	`{name: 'vm/vm_caught_custom_runtime_error.js'},`