From 5de919b6522d3e44beb1c92477f96b99f05a65dd Mon Sep 17 00:00:00 2001 From: Aviv Keller <38299977+RedYetiDev@users.noreply.github.com> Date: Thu, 22 Aug 2024 20:53:46 -0400 Subject: [PATCH] test: use `node:test` in `test-cli-syntax.bad` PR-URL: https://github.com/nodejs/node/pull/54513 Reviewed-By: Benjamin Gruenbaum Reviewed-By: Moshe Atlow Reviewed-By: James M Snell --- test/sequential/test-cli-syntax-bad.js | 55 ++++++++++++++++---------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/test/sequential/test-cli-syntax-bad.js b/test/sequential/test-cli-syntax-bad.js index 5c87bf11419af6..c16de3b50133ec 100644 --- a/test/sequential/test-cli-syntax-bad.js +++ b/test/sequential/test-cli-syntax-bad.js @@ -1,8 +1,8 @@ 'use strict'; -const common = require('../common'); -const assert = require('assert'); +require('../common'); const { exec } = require('child_process'); +const { test } = require('node:test'); const fixtures = require('../common/fixtures'); const node = process.execPath; @@ -23,26 +23,39 @@ const syntaxErrorRE = /^SyntaxError: \b/m; 'syntax/bad_syntax', 'syntax/bad_syntax_shebang.js', 'syntax/bad_syntax_shebang', -].forEach(function(file) { - file = fixtures.path(file); +].forEach((file) => { + const path = fixtures.path(file); // Loop each possible option, `-c` or `--check` - syntaxArgs.forEach(function(args) { - const _args = args.concat(file); - const cmd = [node, ..._args].join(' '); - exec(cmd, common.mustCall((err, stdout, stderr) => { - assert.strictEqual(err instanceof Error, true); - assert.strictEqual(err.code, 1, - `code ${err.code} !== 1 for error:\n\n${err}`); - - // No stdout should be produced - assert.strictEqual(stdout, ''); - - // Stderr should have a syntax error message - assert.match(stderr, syntaxErrorRE); - - // stderr should include the filename - assert(stderr.startsWith(file), `${stderr} starts with ${file}`); - })); + syntaxArgs.forEach((args) => { + test(`Checking syntax for ${file} with ${args.join(' ')}`, async (t) => { + const _args = args.concat(path); + const cmd = [node, ..._args].join(' '); + + try { + const { stdout, stderr } = await execPromise(cmd); + + // No stdout should be produced + t.assert.strictEqual(stdout, ''); + + // Stderr should have a syntax error message + t.assert.match(stderr, syntaxErrorRE); + + // stderr should include the filename + t.assert.ok(stderr.startsWith(path)); + } catch (err) { + t.assert.strictEqual(err.code, 1); + } + }); }); }); + +// Helper function to promisify exec +function execPromise(cmd) { + const { promise, resolve, reject } = Promise.withResolvers(); + exec(cmd, (err, stdout, stderr) => { + if (err) return reject({ ...err, stdout, stderr }); + resolve({ stdout, stderr }); + }); + return promise; +}