fixup! test: add escapePathsFromShellCommand util

Author: aduh95

test/common/index.js

@@ -953,26 +953,21 @@ function expectRequiredModule(mod, expectation, checkESModule = true) {
  * @returns {[string, object | undefined]} An array that can be passed as
  *                                         arguments to `exec` or `execSync`.
  */
-function escapePathsFromShellCommand(cmdParts, ...args) {
+function escapePOSIXShell(cmdParts, ...args) {
   if (common.isWindows) {
     // On Windows, paths cannot contain `"`, so we can return the string unchanged.
     return [String.raw({ raw: cmdParts }, ...args)];
   }
   // On POSIX shells, we can pass values via the env, as there's a standard way for referencing a variable.
-  const env = {...process.env}
+  const env = { ...process.env };
   let cmd = cmdParts[0];
   for (let i = 0; i < args.length; i++) {
-    if (cmdParts[i].at(-1) === '"' && cmdParts[i + 1][0] === '"') {
-      const envVarName = `ESCAPED_${i}`
-      cmd += '$' + envVarName;
-      env[envVarName] = args[i];
-    } else {
-      cmd += args[i];
-    }
-    cmd += cmdParts[i + 1]
+    const envVarName = `ESCAPED_${i}`;
+    env[envVarName] = args[i];
+    cmd += '${' + envVarName + '}' + cmdParts[i + 1];
   }
 
-  return [cmd, { env }]
+  return [cmd, { env }];
 }
 
 const common = {
@@ -982,7 +977,7 @@ const common = {
   childShouldThrowAndAbort,
   createZeroFilledFile,
   defaultAutoSelectFamilyAttemptTimeout,
-  escapePathsFromShellCommand,
+  escapePOSIXShell,
   expectsError,
   expectRequiredModule,
   expectWarning,

test/sequential/test-cli-syntax-good.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { escapePathsFromShellCommand } = require('../common');
+const common = require('../common');
 const assert = require('assert');
 const { exec } = require('child_process');
 const fixtures = require('../common/fixtures');
@@ -24,7 +24,7 @@ const syntaxArgs = [
 
   // Loop each possible option, `-c` or `--check`
   syntaxArgs.forEach(function(flag) {
-    exec(...escapePathsFromShellCommand`"${process.execPath}" ${flag} "${file}"`, common.mustCall((err, stdout, stderr) => {
+    exec(...common.escapePOSIXShell`"${process.execPath}" ${flag} "${file}"`, common.mustCall((err, stdout, stderr) => {
       if (err) {
         console.log('-- stdout --');
         console.log(stdout);