Merge branch 'develop' into e2e/7382-spec-merchant-multi-currency-setup

Automattic · Dec 15, 2023 · fdc0204 · fdc0204
2 parents 42e05d1 + cc42940
commit fdc0204
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/changelog/dev-fix-e2e-tests-on-wc-7-7 b/changelog/dev-fix-e2e-tests-on-wc-7-7
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: Fix e2e tests on WC 7.7.
+
+
diff --git a/tests/e2e/specs/wcpay/shopper/shopper-multi-currency-widget.spec.js b/tests/e2e/specs/wcpay/shopper/shopper-multi-currency-widget.spec.js
@@ -95,6 +95,7 @@ describe( 'Shopper Multi-Currency widget', () => {
 				await setupTest();
 				await page.waitForSelector( '.widget select[name=currency]', {
 					visible: true,
+					timeout: 5000,
 				} );
 				await page.select( '.widget select[name=currency]', 'EUR' );
 				await expect( page.url() ).toContain(
@@ -105,6 +106,7 @@ describe( 'Shopper Multi-Currency widget', () => {
 				);
 				// Change it back to USD for the other tests.
 				await page.select( '.widget select[name=currency]', 'USD' );
+				await page.reload( { waitUntil: 'networkidle0' } );
 			} );
 		}
 	);
@@ -178,5 +180,6 @@ describe( 'Shopper Multi-Currency widget', () => {
 			'.widget select[name=currency]'
 		);
 		expect( currencySwitcher ).toBeNull();
+		await merchant.logout();
 	} );
 } );
diff --git a/tests/e2e/utils/flows.js b/tests/e2e/utils/flows.js
@@ -779,7 +779,11 @@ export const merchantWCP = {
 			searchInput.type( 'switcher', { delay: 20 } );
 
 			await page.waitForSelector(
-				'button.components-button[role="option"]'
+				'button.components-button[role="option"]',
+				{
+					visible: true,
+					timeout: 5000,
+				}
 			);
 			await page.click( 'button.components-button[role="option"]' );
 			await page.waitFor( 2000 );
@@ -799,7 +803,7 @@ export const merchantWCP = {
 		await merchant.openNewOrder();
 		await page.click( 'button.add-line-item' );
 		await page.click( 'button.add-order-item' );
-		await page.click( 'select.wc-product-search' );
+		await page.click( 'select[name="item_id"]' );
 		await page.type(
 			'.select2-search--dropdown > input',
 			config.get( 'products.simple.name' ),