Fix E2E shopper tests around 3DS and UPE settings

changelog/fix-e2e-tests

@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Fix for E2E shopper tests around 3DS and UPE settings

tests/e2e/config/default.json

@@ -84,6 +84,7 @@
           "addressfirstline": "Rue de l’Étuve, 1000",
           "addresssecondline": "billing-be",
           "city": "Bruxelles",
+          "postcode": "1000",
           "phone": "123456789",
           "email": "[email protected]"
         },
@@ -95,6 +96,7 @@
           "addressfirstline": "Petuelring 130",
           "addresssecondline": "billing-de",
           "city": "München",
+          "postcode": "80809",
           "state": "DE-BY",
           "phone": "123456789",
           "email": "[email protected]"

tests/e2e/utils/flows.js

@@ -426,7 +426,17 @@ export const merchantWCP = {
 					button.click()
 				);
 			}
-			await page.$eval( paymentMethod, ( method ) => method.click() );
+			// Check if paymentMethod is an XPath
+			if ( paymentMethod.startsWith( '//' ) ) {
+				// Find the element using XPath and click it
+				const elements = await page.$x( paymentMethod );
+				if ( elements.length > 0 ) {
+					await elements[ 0 ].click();
+				}
+			} else {
+				// If it's a CSS selector, use $eval
+				await page.$eval( paymentMethod, ( method ) => method.click() );
+			}
 			await expect( page ).toClick( 'button', {
 				text: 'Remove',
 			} );

tests/e2e/utils/payments.js

@@ -197,7 +197,7 @@ export async function confirmCardAuthentication(
 	);
 	let challengeFrame = await challengeFrameHandle.contentFrame();
 	// 3DS 1 cards have another iframe enclosing the authorize form
-	if ( cardType.toUpperCase() === '3DS' ) {
+	if ( cardType.toUpperCase() === '3DS1' ) {
 		const acsFrameHandle = await challengeFrame.waitForSelector(
 			'iframe[name="acsFrame"]'
 		);