From ac71865f2c428fe717fa9066df2e94c04483d801 Mon Sep 17 00:00:00 2001
From: Moshe Atlow <moshe@atlow.co.il>
Date: Fri, 5 May 2023 20:10:31 +0300
Subject: [PATCH] test: fix output tests when path includes node version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/47843
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
---
 test/parallel/test-node-output-console.mjs    | 9 +++------
 test/parallel/test-node-output-errors.mjs     | 8 ++++----
 test/parallel/test-node-output-sourcemaps.mjs | 2 +-
 test/parallel/test-node-output-vm.mjs         | 2 +-
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/test/parallel/test-node-output-console.mjs b/test/parallel/test-node-output-console.mjs
index 6656028bae4795..633f2db9f08bc1 100644
--- 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
index 5668fca4dc89b8..1de7b52bb61a64 100644
--- 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
index a226cd9800d14e..8e43947ab2188f 100644
--- 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
index 52dc9a0d57607c..eb02ed3b46e4d7 100644
--- 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' },