Multiple selector fixes for 1.50.1

Automattic · Feb 6, 2025 · 985c290 · 985c290
1 parent e55bc7f
commit 985c290
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/tests/e2e-pw/specs/subscriptions/merchant/merchant-subscriptions-renew.spec.ts b/tests/e2e-pw/specs/subscriptions/merchant/merchant-subscriptions-renew.spec.ts
@@ -50,9 +50,7 @@ describeif( shouldRunSubscriptionsTests )(
 			// Get the subscription ID
 			subscriptionId = (
 				await shopperPage
-					.getByRole( 'cell', {
-						name: 'ID: View subscription number',
-					} )
+					.getByRole( 'link', { name: 'View subscription number' } )
 					.textContent()
 			 )
 				.trim()

diff --git a/tests/e2e-pw/specs/subscriptions/shopper/shopper-subscriptions-purchase-free-trial.spec.ts b/tests/e2e-pw/specs/subscriptions/shopper/shopper-subscriptions-purchase-free-trial.spec.ts
@@ -103,7 +103,12 @@ describeif( shouldRunSubscriptionsTests )(
 
 			// Verify that the order total is $0.00
 			await expect(
-				shopperPage.getByRole( 'cell', { name: /^Total: \$0\.00/ } )
+				shopperPage
+					.getByRole( 'row', {
+						name: 'Total $0.00',
+						exact: true,
+					} )
+					.locator( 'td' )
 			).toBeVisible();
 
 			// Proceed to the checkout page and verify that the 14-day free trial is shown in the product line item,

diff --git a/...s/e2e-pw/specs/subscriptions/shopper/shopper-subscriptions-purchase-no-signup-fee.spec.ts b/...s/e2e-pw/specs/subscriptions/shopper/shopper-subscriptions-purchase-no-signup-fee.spec.ts
@@ -83,7 +83,7 @@ describeif( shouldRunSubscriptionsTests )(
 			// Verify we have an active subscription
 			const relatedSubscriptionId = (
 				await merchantPage
-					.getByRole( 'cell', { name: 'Edit order number' } )
+					.getByRole( 'link', { name: 'Edit order number' } )
 					.textContent()
 			 )
 				.trim()

diff --git a/tests/e2e-pw/specs/wcpay/shopper/shopper-wc-blocks-saved-card-checkout-and-usage.spec.ts b/tests/e2e-pw/specs/wcpay/shopper/shopper-wc-blocks-saved-card-checkout-and-usage.spec.ts
@@ -36,7 +36,9 @@ describeif( shouldRunWCBlocksTests )(
 		const card = config.cards.basic;
 
 		test.beforeAll( async ( { browser }, { project } ) => {
-			shopperPage = ( await getShopper( browser ) ).shopperPage;
+			shopperPage = (
+				await getShopper( browser, true, project.use.baseURL )
+			 ).shopperPage;
 
 			if (
 				! ( await checkPageExists(

diff --git a/tests/e2e-pw/utils/merchant.ts b/tests/e2e-pw/utils/merchant.ts
@@ -452,7 +452,11 @@ export const addWCBCheckoutPage = async ( page: Page ) => {
 	await page.keyboard.press( 'Escape' ); // to dismiss a dialog if present
 
 	// Enable the "Company" field if it's not already enabled.
-	await page.getByLabel( 'Block: Shipping Address' ).click();
+	await page
+		.locator( 'iframe[name="editor-canvas"]' )
+		.contentFrame()
+		.getByRole( 'document', { name: 'Block: Shipping Address' } )
+		.click();
 
 	const companyCheckbox = page
 		.locator( '.components-toggle-control' )