Updating to latest E2E test utils. Using clickButton instead of our o…

…wn custom, which will scroll down if not in view.
gocodebox · Dec 9, 2024 · 5b0e235 · 5b0e235
1 parent 3f9e3b0
commit 5b0e235
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 33 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/llms-e2e-test-utils/package.json b/packages/llms-e2e-test-utils/package.json
@@ -21,7 +21,7 @@
   },
   "main": "src/index.js",
   "dependencies": {
-    "@wordpress/e2e-test-utils": "^7.0.0",
+    "@wordpress/e2e-test-utils": "^11.13.0",
     "css-xpath": "^1.0.0",
     "semver": "^7.3.5"
   },

diff --git a/packages/llms-e2e-test-utils/src/click.js b/packages/llms-e2e-test-utils/src/click.js
@@ -8,8 +8,6 @@
  * @return {void}
  */
 export async function click( selector ) {
-	const target = await page.$( selector );
-	target.scrollIntoView();
 	await page.waitForSelector( selector );
 	await page.$eval( selector, ( el ) => el.click() );
 }
diff --git a/packages/llms-e2e-test-utils/src/run-setup-wizard.js b/packages/llms-e2e-test-utils/src/run-setup-wizard.js
@@ -4,7 +4,7 @@ import { findElementByText } from './find-element-by-text';
 import { wpVersionCompare } from './wp-version-compare';
 import { dismissEditorWelcomeGuide } from './dismiss-editor-welcome-guide';
 
-import { visitAdminPage } from '@wordpress/e2e-test-utils';
+import { visitAdminPage, clickButton } from '@wordpress/e2e-test-utils';
 
 /**
  * Retrieve the Setup Wizard Page Title.
@@ -78,22 +78,26 @@ export async function runSetupWizard( {
 	} else if ( coursesToImport ) {
 		// Import courses.
 
-		console.log('taking before screenshot');
-		await page.screenshot({
-			path: 'screenshots/before-selecting-courses-setup-wizard.jpg'
-		});
-
 		// Select specified courses.
 		for ( const courseTitle of coursesToImport ) {
 			await clickElementByText( courseTitle, 'h3' );
 		}
 
-		console.log('taking after screenshot');
 		await page.screenshot({
 			path: 'screenshots/after-selecting-courses-setup-wizard.jpg'
 		});
 
-		await clickAndWait( '.llms-setup-actions .llms-button-primary' );
+		await clickButton( 'Import Courses' );
+
+		await page.screenshot({
+			path: 'screenshots/after-clicked-import-button.jpg'
+		});
+
+		await page.waitForNavigation();
+
+		await page.screenshot({
+			path: 'screenshots/after-setup-wizard-navigation.jpg'
+		});
 
 		if ( 1 === coursesToImport.length ) {
 			// Single course imported.