@brightspace-ui/testing 1.39.1 → 1.40.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "@brightspace-ui/testing",
   "description": "Utilities for testing front-end components and applications",
   "type": "module",
-  "version": "1.39.1",
+  "version": "1.40.0",
   "repository": "https://github.com/BrightspaceUI/testing.git",
   "scripts": {
     "lint": "npm run lint:eslint && npm run lint:style",
@@ -53,7 +53,7 @@
     "@web/test-runner-playwright": "^0.11",
     "command-line-args": "^6",
     "command-line-usage": "^7",
-    "d2l-test-reporting": "^4",
+    "d2l-test-reporting": "^5",
     "glob": "^13",
     "lit": "^2 || ^3",
     "pixelmatch": "^7",

package/src/server/report/result.js

@@ -234,9 +234,9 @@ export function renderBrowserResults(browser, tests, options) {
 		let status = STATUS_TYPE.NORMAL;
 		if (resultData.info) {
 			status = STATUS_TYPE.WARNING;
-			if (resultData.duration > resultData.info.slowDuration) {
+			if (resultData.duration > resultData.slowDuration) {
 				status = STATUS_TYPE.ERROR;
-			} else if (resultData.duration < (resultData.info.slowDuration / 2)) {
+			} else if (resultData.duration < (resultData.slowDuration / 2)) {
 				status = STATUS_TYPE.NORMAL;
 			}
 		}

package/src/server/visual-diff-info.js

@@ -1,29 +1,28 @@
 const testInfoMap = new Map();
 
 export class TestInfoManager {
-	constructor(session, fullTitle) {
+	constructor(session, fullTitle, slowDuration) {
 		this.key = `${session.browser.name.toLowerCase()}|${session.testFile}|${fullTitle}`;
+		if (!testInfoMap.has(this.key)) testInfoMap.set(this.key, { slowDuration, tests: {} });
 	}
 	get() {
 		return testInfoMap.get(this.key);
 	}
 
 	set(testInfo, alt = 'default') {
-		if (testInfoMap.has(this.key)) {
-			const info = this.get()?.[alt] || {};
-			testInfo.slowDuration = info.slowDuration;
+		const tests = this.get().tests;
 
-			if (info.golden || testInfo.golden) {
-				testInfo.golden = { ...info.golden, ...testInfo.golden };
+		if (!(alt in tests)) {
+			tests[alt] = testInfo;
+		} else {
+			const info = tests[alt];
+			for (const prop in testInfo) {
+				if ((prop === 'golden' || prop === 'new') && prop in info) {
+					info[prop] = { ...info[prop], ...testInfo[prop] };
+				}
+				else info[prop] = testInfo[prop];
 			}
-			if (info.new || testInfo.new) {
-				testInfo.new = { ...info.new, ...testInfo.new };
-			}
-			testInfo.diff = testInfo.diff || info.diff;
-			testInfo.byteSizeDiff = testInfo.byteSizeDiff || info.byteSizeDiff;
 		}
-		const tests = testInfoMap.get(this.key) || {};
-		testInfoMap.set(this.key, { ...tests, [alt]: testInfo });
 	}
 }
 

package/src/server/visual-diff-plugin.js

@@ -185,7 +185,7 @@ export function visualDiff({ updateGoldens = false, runSubset = false } = {}) {
 			await clearAllDirs(updateGoldens, join(rootDir, PATHS.VDIFF_ROOT));
 		},
 		async executeCommand({ command, payload, session }) {
-			const infoManager = new TestInfoManager(session, payload.name);
+			const infoManager = new TestInfoManager(session, payload.name, payload.slowDuration);
 
 			if (session.browser.type !== 'playwright') {
 				throw new Error('Visual-diff is only supported for browser type Playwright.');
@@ -249,7 +249,6 @@ export function visualDiff({ updateGoldens = false, runSubset = false } = {}) {
 
 				const screenshotImage = PNG.sync.read(screenshotFileBuffers[alt]);
 				infoManager.set({
-					slowDuration: payload.slowDuration,
 					new: {
 						height: screenshotImage.height,
 						path: screenshotFileName.substring(rootLength),

package/src/server/visual-diff-reporter.js

@@ -92,8 +92,8 @@ function flattenResults(session, browserData, fileData) {
 			// tests missing info but with no error were skipped via grep, so exclude them
 			if (!allTestInfo && !t.error) return;
 
-			for (const test in allTestInfo) {
-				const info = allTestInfo[test];
+			for (const test in allTestInfo.tests) {
+				const info = allTestInfo.tests[test];
 				if (test !== 'default') testName = `${prefix}${t.name} (${test})`;
 				if (!fileData.tests.has(testName)) {
 					fileData.tests.set(testName, {
@@ -119,6 +119,7 @@ function flattenResults(session, browserData, fileData) {
 					error: t.error?.message,
 					passed,
 					bytediff: info.byteSizeDiff,
+					slowDuration: allTestInfo.slowDuration,
 					info: info
 				});
 			}