@enact/ui-test-utils 1.0.0-alpha.1 → 1.0.1

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@enact/ui-test-utils",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.1",
   "description": "UI Testing for the Enact framework",
+  "repository": "https://github.com/enactjs/ui-test-utils",
   "main": "index.js",
   "bin": {
     "start-tests": "./start-tests.js"
@@ -38,12 +39,13 @@
     "webdriverio": "^7.9.0"
   },
   "devDependencies": {
+    "@babel/eslint-plugin": "^7.17.7",
     "eslint": "^8.12.0",
-    "eslint-config-enact": "^4.0.0",
+    "eslint-config-enact": "^4.1.1",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-babel": "^5.3.1",
-    "eslint-plugin-enact": "^1.0.0",
+    "eslint-plugin-enact": "^1.0.1",
     "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-jest": "^26.1.5",
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.29.4",

package/screenshot/index.js

@@ -1,4 +1,4 @@
-import {render} from 'react-dom';
+import {createRoot} from 'react-dom/client';
 import App, {testMetadata} from 'UI_TEST_APP_ENTRY';
 import TestChooser from './TestChooser';
 
@@ -18,13 +18,9 @@ if ('testId' in props) props.testId = Number.parseInt(props.testId);
 if ('request' in props) {
 	window.__TEST_DATA = testMetadata;
 } else if (Object.keys(props).length) {
-	render(
-		<App {...props} />,
-		document.getElementById('root')
-	);
+	createRoot(document.getElementById('root'))
+		.render(<App {...props} />);
 } else {
-	render(
-		<TestChooser metadata={testMetadata} />,
-		document.getElementById('root')
-	);
+	createRoot(document.getElementById('root'))
+		.render(<TestChooser metadata={testMetadata} />);
 }

package/ui/index.js

@@ -1,4 +1,4 @@
-import {render} from 'react-dom';
+import {createRoot} from 'react-dom/client';
 import App from 'UI_TEST_APP_ENTRY';
 
 const url = new URL(window.location.href);
@@ -7,10 +7,8 @@ const locale = url.searchParams.get('locale');
 const appElement = (<App locale={locale} />);
 
 if (typeof window !== 'undefined') {
-	render(
-		appElement,
-		document.getElementById('root')
-	);
+	createRoot(document.getElementById('root'))
+		.render(appElement);
 }
 
 export default appElement;

package/utils/Page.js

@@ -13,6 +13,10 @@ class Page {
 	}
 
 	async open (appPath, urlExtra = '?locale=en-US') {
+		await browser.execute(function () {
+			document.body.innerHTML = '';
+		});
+
 		this._url = `/${appPath}/${urlExtra}`;
 		// Can't resize browser window when connected to remote debugger!
 		if (!browser._options || !browser._options.remote) {
@@ -22,7 +26,9 @@ class Page {
 		await browser.url(this.url);
 
 		const body = await $('body');
-		await body.waitForExist({timeout: 1000});
+		await body.waitForDisplayed({timeout: 5000});
+
+		await this.delay(200);
 	}
 
 	serializeParams (params) {
@@ -69,7 +75,7 @@ class Page {
 
 	// For testing "pointer off" by timeout.
 	async hidePointerByKeycode () {
-		browser.execute(function () {
+		await browser.execute(function () {
 			const event = document.createEvent('Events');
 			event.initEvent('keydown', true, true);
 			event.keyCode = 1537;
@@ -136,7 +142,7 @@ class Page {
 		await browser.waitUntil(() => target.isExisting() && target.isFocused(), {timeout, timeoutMsg, interval});
 	}
 
-	async waitTransitionEnd (delay = 3000, msg = 'timed out waiting for transitionend', callback, ignore = ['opacity', 'filter']) {
+	async waitTransitionEnd (timeout = 3000, timeoutMsg = 'timed out waiting for transitionend', callback, ignore = ['opacity', 'filter']) {
 		await browser.execute(
 			// eslint-disable-next-line no-shadow
 			function (ignore) {
@@ -153,15 +159,14 @@ class Page {
 			callback();
 		}
 		await browser.waitUntil(
-			function () {
-				return browser.execute(
+			async function () {
+				return await browser.execute(
 					function () {
 						return window.__transition;
 					}
 				);
 			},
-			delay,
-			msg
+			{timeout, timeoutMsg}
 		);
 	}
 }

package/utils/runTest.js

@@ -19,7 +19,7 @@ const runTest = ({concurrency, filter, Page, testName, ...rest}) => {
 			await Page.open('?request');
 
 			let testCases = await browser.execute(async function () {
-				return await window.__TEST_DATA; // eslint-disable-line no-undef
+				return await window.__TEST_DATA;
 			});
 
 			await expect(testCases).to.be.an('object', 'Test data failed to load');