Rename things

bin/test.js → bin/d2l-test-runner.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { argv } from 'node:process';
-import { runner } from '../src/server/cli/test.js';
+import { runner } from '../src/server/cli/test-runner.js';
 
 const options = await runner.getOptions(argv);
 

package.json

@@ -11,11 +11,11 @@
     "test:bin": "mocha './test/bin/**/*.test.js'",
     "test:browser": "web-test-runner --files './test/browser/**/*.test.js' --node-resolve --playwright",
     "test:server": "mocha './test/server/**/*.test.js'",
-    "test:vdiff": "d2l-test --config ./test/browser/d2l-test.config.js --group vdiff",
+    "test:vdiff": "npx d2l-test-runner--config ./test/browser/d2l-test.config.js --group vdiff",
     "test:vdiff:golden": "npm run test:vdiff -- --golden"
   },
   "bin": {
-    "d2l-test": "./bin/test.js"
+    "d2l-test-runner": "./bin/d2l-test-runner.js"
   },
   "author": "D2L Corporation",
   "license": "Apache-2.0",

src/server/cli/test.js → src/server/cli/test-runner.js

@@ -10,7 +10,7 @@ async function getTestRunnerOptions(argv = []) {
 	const DISALLOWED_OPTIONS = ['--browsers', '--playwright', '--puppeteer', '--groups'];
 
 	const optionDefinitions = [
-		// @web/test-runner options
+		// web-test-runner options
 		{
 			name: 'files',
 			type: String,
@@ -39,7 +39,7 @@ async function getTestRunnerOptions(argv = []) {
 			order: 9
 		},
 
-		// d2l-test options
+		// d2l-test-runner options
 		{
 			name: 'chrome',
 			type: Boolean,
@@ -50,7 +50,7 @@ async function getTestRunnerOptions(argv = []) {
 			name: 'config',
 			alias: 'c',
 			type: String,
-			description: 'Location to read config file from\n[Default: ./d2l-test.config.js]',
+			description: 'Location to read config file from\n[Default: ./d2l-test-runner.config.js]',
 			order: 9
 		},
 		{
@@ -111,7 +111,7 @@ async function getTestRunnerOptions(argv = []) {
 			},
 			{
 				header: 'Usage',
-				content: 'd2l-test [options]',
+				content: 'd2l-test-runner [options]',
 			},
 			{
 				header: 'Options',
@@ -127,7 +127,7 @@ async function getTestRunnerOptions(argv = []) {
 
 	cliArgs._unknown = cliArgs._unknown?.filter(o => !DISALLOWED_OPTIONS.includes(o));
 
-	const testConfig = await readConfig('d2l-test.config', cliArgs.config).catch(err => {
+	const testConfig = await readConfig('d2l-test-runner.config', cliArgs.config).catch(err => {
 		if (err instanceof ConfigLoaderError) {
 			throw new Error(err.message);
 		} else {

test/bin/test.test.js → test/bin/d2l-test-runner.test.js

@@ -1,14 +1,14 @@
 import { assert, restore, stub } from 'sinon';
 import { argv } from 'node:process';
-import { runner } from '../../src/server/cli/test.js';
+import { runner } from '../../src/server/cli/test-runner.js';
 
-describe('d2l-test', () => {
+describe('d2l-test-runner', () => {
 
 	it('starts test runner with options', async() => {
 		const opts = { my: 'options' };
 		const optionsStub = stub(runner, 'getOptions').returns(opts);
 		const startStub = stub(runner, 'start');
-		await import('../../bin/test.js');
+		await import('../../bin/d2l-test-runner.test.js');
 
 		assert.calledOnceWithExactly(optionsStub, argv);
 		assert.calledOnceWithExactly(startStub, opts);

test/server/cli/test.test.js → test/server/cli/test-runner.test.js

@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { runner } from '../../../src/server/cli/test.js';
+import { runner } from '../../../src/server/cli/test-runner.js';
 
 describe('runner.getOptions()', () => {
 
@@ -38,7 +38,7 @@ describe('runner.getOptions()', () => {
 
 	it('should convert aliases', async() => {
 		const opts = await runner.getOptions([
-			'-c', './test/browser/d2l-test.config.js',
+			'-c', './test/browser/vdiff.config.js',
 			'-f', 'abc',
 			'-g', 'ghi',
 			'-t', 123]