Update checks on place order button for WC blocks

Automattic · Feb 6, 2025 · 069eca1 · 069eca1
1 parent e40174b
commit 069eca1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/tests/e2e-pw/specs/wcpay/shopper/shopper-wc-blocks-checkout-failures.spec.ts b/tests/e2e-pw/specs/wcpay/shopper/shopper-wc-blocks-checkout-failures.spec.ts
@@ -100,6 +100,13 @@ describeif( shouldRunWCBlocksTests )(
 				await shopper.placeOrderWCB( shopperPage, false );
 
 				if ( auth ) {
+					const placeOrderButton = shopperPage.locator(
+						'.wc-block-components-checkout-place-order-button'
+					);
+					await expect( placeOrderButton ).toBeDisabled();
+					await expect( placeOrderButton ).toHaveClass(
+						/wc-block-components-button--loading/
+					);
 					await shopper.confirmCardAuthentication( shopperPage );
 				}
 

diff --git a/tests/e2e-pw/utils/shopper.ts b/tests/e2e-pw/utils/shopper.ts
@@ -143,20 +143,15 @@ export const placeOrderWCB = async (
 	page: Page,
 	confirmOrderReceived = true
 ) => {
-	const placeOrderButton = page.locator(
-		'.wc-block-components-checkout-place-order-button'
-	);
+	const placeOrderButton = page.getByRole( 'button', {
+		name: 'Place Order',
+	} );
 
 	await placeOrderButton.focus();
 	await waitForUiRefresh( page );
 
 	await placeOrderButton.click();
 
-	await expect( placeOrderButton ).toBeDisabled();
-	await expect( placeOrderButton ).toHaveClass(
-		/wc-block-components-button--loading/
-	);
-
 	if ( confirmOrderReceived ) {
 		await page.waitForURL( /\/order-received\// );
 		await expect(