Add describe wrappers so test output makes sense without filenames (#2472)

Author: shadowspawn

tests/args.literal.test.js

@@ -1,32 +1,34 @@
 const commander = require('../');
-const { test } = require('node:test');
+const { test, describe } = require('node:test');
 const assert = require('node:assert/strict');
 
 // Utility Conventions: http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap12.html#tag_12_02
 //
 // 12.2 Utility Syntax Guidelines, Guideline 10:
 // The first -- argument that is not an option-argument should be accepted as a delimiter indicating the end of options. Any following arguments should be treated as operands, even if they begin with the '-' character.
 
-test('when arguments includes -- then stop processing options', () => {
-  const program = new commander.Command();
-  program
-    .option('-f, --foo', 'add some foo')
-    .option('-b, --bar', 'add some bar')
-    .argument('[args...]');
-  program.parse(['node', 'test', '--foo', '--', '--bar', 'baz']);
-  // More than one assert, ported from legacy test
-  const opts = program.opts();
-  assert.equal(opts.foo, true);
-  assert.equal(opts.bar, undefined);
-  assert.deepEqual(program.args, ['--bar', 'baz']);
-});
+describe('end of options delimiter "--"', () => {
+  test('when arguments includes -- then stop processing options', () => {
+    const program = new commander.Command();
+    program
+      .option('-f, --foo', 'add some foo')
+      .option('-b, --bar', 'add some bar')
+      .argument('[args...]');
+    program.parse(['node', 'test', '--foo', '--', '--bar', 'baz']);
+    // More than one assert, ported from legacy test
+    const opts = program.opts();
+    assert.equal(opts.foo, true);
+    assert.equal(opts.bar, undefined);
+    assert.deepEqual(program.args, ['--bar', 'baz']);
+  });
 
-test('when arguments include -- then more literals are passed-through as args', () => {
-  const program = new commander.Command();
-  program
-    .option('-f, --foo', 'add some foo')
-    .option('-b, --bar', 'add some bar')
-    .argument('[args...]');
-  program.parse(['node', 'test', '--', 'cmd', '--', '--arg']);
-  assert.deepEqual(program.args, ['cmd', '--', '--arg']);
+  test('when arguments include -- then more -- are passed-through as args', () => {
+    const program = new commander.Command();
+    program
+      .option('-f, --foo', 'add some foo')
+      .option('-b, --bar', 'add some bar')
+      .argument('[args...]');
+    program.parse(['node', 'test', '--', 'cmd', '--', '--arg']);
+    assert.deepEqual(program.args, ['cmd', '--', '--arg']);
+  });
 });

tests/args.variadic.test.js

@@ -4,7 +4,7 @@ const assert = require('node:assert/strict');
 
 // Testing variadic arguments.
 
-describe('variadic argument', () => {
+describe('Command variadic argument using .arguments() or .command()', () => {
   test('when no extra arguments specified for program then variadic arg is empty array', (t) => {
     const actionMock = t.mock.fn();
     const program = new commander.Command();

tests/argument.choices.test.js

@@ -3,30 +3,32 @@ const { createTestCommand } = require('./testHelpers');
 const { test, describe } = require('node:test');
 const assert = require('node:assert/strict');
 
-test('when command argument in choices then argument set', () => {
-  const program = createTestCommand();
-  let shade;
-  program
-    .addArgument(new commander.Argument('<shade>').choices(['red', 'blue']))
-    .action((shadeParam) => {
-      shade = shadeParam;
-    });
-  program.parse(['red'], { from: 'user' });
-  assert.equal(shade, 'red');
-});
+describe('Argument.choices()', () => {
+  test('when command argument in choices then argument set', () => {
+    const program = createTestCommand();
+    let shade;
+    program
+      .addArgument(new commander.Argument('<shade>').choices(['red', 'blue']))
+      .action((shadeParam) => {
+        shade = shadeParam;
+      });
+    program.parse(['red'], { from: 'user' });
+    assert.equal(shade, 'red');
+  });
 
-test('when command argument is not in choices then error', () => {
-  // Lightweight check, more detailed testing of behaviour in command.exitOverride.test.js
-  const program = createTestCommand();
-  program.addArgument(
-    new commander.Argument('<shade>').choices(['red', 'blue']),
-  );
-  assert.throws(() => {
-    program.parse(['orange'], { from: 'user' });
+  test('when command argument is not in choices then error', () => {
+    // Lightweight check, more detailed testing of behaviour in command.exitOverride.test.js
+    const program = createTestCommand();
+    program.addArgument(
+      new commander.Argument('<shade>').choices(['red', 'blue']),
+    );
+    assert.throws(() => {
+      program.parse(['orange'], { from: 'user' });
+    });
   });
 });
 
-describe('choices parameter is treated as readonly, per TypeScript declaration', () => {
+describe('Argument.choices() parameter is treated as readonly, per TypeScript declaration', () => {
   test('when choices called then parameter does not change', () => {
     // Unlikely this could break, but check the API we are declaring in TypeScript.
     const original = ['red', 'blue', 'green'];