@brightspace-ui/testing 1.7.1 → 1.8.1

package/package.json

@@ -2,7 +2,7 @@
   "name": "@brightspace-ui/testing",
   "description": "Utilities for testing front-end components and applications",
   "type": "module",
-  "version": "1.7.1",
+  "version": "1.8.1",
   "repository": "https://github.com/BrightspaceUI/testing.git",
   "scripts": {
     "lint": "eslint . --ext .js",

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

@@ -133,7 +133,7 @@ async function getTestRunnerOptions(argv = []) {
 			},
 			{
 				header: 'Usage',
-				content: 'd2l-test-runner [options]\nd2l-test-runner <command> [options]\n',
+				content: 'd2l-test-runner [options]\nd2l-test-runner <group> [options]\nd2l-test-runner <command> [options]\n',
 			},
 			{
 				header: 'Options',

package/src/server/wtr-config.js

@@ -54,7 +54,7 @@ export class WTRConfig {
 	}
 
 	get #pattern() {
-		const files = this.#cliArgs.files || [ this.pattern(this.#cliArgs.group) ];
+		const files = [ this.#cliArgs.files || this.pattern(this.#cliArgs.group), '!**/node_modules/**/*' ].flat();
 
 		if (this.#cliArgs.filter) {
 			return this.#filterFiles(files);
@@ -126,16 +126,20 @@ export class WTRConfig {
 	#filterFiles(files) {
 		return this.#cliArgs.filter.map(filterStr => {
 			// replace everything after the last forward slash
-			return files.map(f => f.replace(/[^/]*$/, fileGlob => {
-				// create a new glob for each wildcard
-				const fileGlobs = Array.from(fileGlob.matchAll(/(?<!\*)\*(?!\*)/g)).map(({ index }) => {
-					const arr = fileGlob.split('');
-					arr.splice(index, 1, filterStr);
-					return arr.join('');
-				});
-				return `+(${fileGlobs.join('|') || fileGlob})`;
-			}));
-		}).flat();
+			return files
+				.filter(f => !f.startsWith('!')) // don't filter exclusions
+				.map(f => f.replace(/[^/]*$/, fileGlob => {
+					// create a new glob for each wildcard
+					const fileGlobs = Array.from(fileGlob.matchAll(/(?<!\*)\*(?!\*)/g)).map(({ index }) => {
+						const arr = fileGlob.split('');
+						arr.splice(index, 1, filterStr);
+						return arr.join('');
+					});
+					return `+(${fileGlobs.join('|') || fileGlob})`;
+				}));
+		})
+			.flat()
+			.concat(files.filter(f => f.startsWith('!')));
 	}
 
 	#getMochaConfig(group, slowConfig, timeoutConfig) {
@@ -174,10 +178,6 @@ export class WTRConfig {
 		const { files, filter, golden, grep, group, open, watch } = this.#cliArgs;
 		const passthroughGroupNames = passthroughConfig.groups?.map(g => g.name) ?? [];
 
-		if (!['test', 'vdiff', ...passthroughGroupNames].includes(group)) {
-			return {}; // allow wtr to error
-		}
-
 		delete passthroughConfig.browsers;
 
 		if (typeof pattern !== 'function') throw new TypeError('pattern must be a function');
@@ -189,6 +189,15 @@ export class WTRConfig {
 			...passthroughConfig
 		};
 
+		if (!['test', 'vdiff', ...passthroughGroupNames].includes(group)) {
+			config.groups.push({ name: group, files: this.#pattern });
+		} else {
+			const groupConfig = config.groups.find(g => g.name === group);
+			if (groupConfig) {
+				groupConfig.files = this.#pattern;
+			}
+		}
+
 		if (filter) {
 			config.groups.forEach(group => {
 				group.files = this.#filterFiles([ group.files ].flat());