Merge branch 'develop' into update/deprecating-sofort-from-checkout

changelog/dev-10074-pw-shopper-blocks-checkout-purchase

@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+E2E Playwright Migration: convert shopper-wc-blocks-checkout-purchase spec

changelog/fix-10193-form-fields-reference

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Update gateway form fields references to prevent errors.

includes/admin/class-wc-rest-payments-settings-controller.php

@@ -946,8 +946,9 @@ private function update_woopay_enabled_locations( WP_REST_Request $request ) {
 		}
 
 		$woopay_enabled_locations = $request->get_param( 'woopay_enabled_locations' );
+		$wcpay_form_fields        = $this->wcpay_gateway->get_form_fields();
+		$all_locations            = $wcpay_form_fields['payment_request_button_locations']['options'];
 
-		$all_locations = $this->wcpay_gateway->form_fields['payment_request_button_locations']['options'];
 		WC_Payments::woopay_tracker()->woopay_locations_updated( $all_locations, $woopay_enabled_locations );
 
 		$this->wcpay_gateway->update_option( 'platform_checkout_button_locations', $woopay_enabled_locations );

includes/class-wc-payments-woopay-button-handler.php

@@ -125,8 +125,8 @@ public function init() {
 
 		// Create WooPay button location option if it doesn't exist and enable all locations by default.
 		if ( ! array_key_exists( self::BUTTON_LOCATIONS, get_option( 'woocommerce_woocommerce_payments_settings' ) ) ) {
-			if ( isset( $this->gateway->form_fields[ self::BUTTON_LOCATIONS ]['options'] ) ) {
-				$all_locations = $this->gateway->form_fields[ self::BUTTON_LOCATIONS ]['options'];
+			if ( isset( $this->gateway->get_form_fields()[ self::BUTTON_LOCATIONS ]['options'] ) ) {
+				$all_locations = $this->gateway->get_form_fields()[ self::BUTTON_LOCATIONS ]['options'];
 
 				$this->gateway->update_option( self::BUTTON_LOCATIONS, array_keys( $all_locations ) );
 				WC_Payments::woopay_tracker()->woopay_locations_updated( $all_locations, array_keys( $all_locations ) );

tests/e2e-pw/specs/shopper/shopper-multi-currency-widget.spec.ts

@@ -42,17 +42,6 @@ test.describe( 'Shopper Multi-Currency widget', () => {
 		).toBeVisible();
 	} );
 
-	test( 'should not display currency switcher widget if multi-currency is disabled', async () => {
-		await merchant.deactivateMulticurrency( merchantPage );
-
-		await navigation.goToShop( shopperPage );
-		await expect(
-			shopperPage.locator( '.widget select[name=currency]' )
-		).not.toBeVisible();
-
-		await merchant.activateMulticurrency( merchantPage );
-	} );
-
 	test.describe( 'Should allow shopper to switch currency', () => {
 		test.afterEach( async () => {
 			await shopperPage.selectOption(
@@ -124,4 +113,15 @@ test.describe( 'Shopper Multi-Currency widget', () => {
 			merchantPage.locator( '.widget select[name=currency]' )
 		).not.toBeVisible();
 	} );
+
+	test( 'should not display currency switcher widget if multi-currency is disabled', async () => {
+		await merchant.deactivateMulticurrency( merchantPage );
+
+		await navigation.goToShop( shopperPage );
+		await expect(
+			shopperPage.locator( '.widget select[name=currency]' )
+		).not.toBeVisible();
+
+		await merchant.activateMulticurrency( merchantPage );
+	} );
 } );

tests/e2e-pw/specs/shopper/shopper-myaccount-saved-cards.spec.ts

@@ -73,19 +73,27 @@ test.describe( 'Shopper can save and delete cards', () => {
 		// Otherwise, you will get the error message,
 		// "You cannot add a new payment method so soon after the previous one."
 		// Source: /docker/wordpress/wp-content/plugins/woocommerce/includes/class-wc-form-handler.php#L509-L521
+
+		// Be careful that this is only needed for a successful card addition, so call it only where it's needed the most, to prevent unnecessary delays.
 		const timeTestFinished = Date.now();
 		const elapsedWaitTime = timeTestFinished - timeAdded;
 		const remainingWaitTime =
 			20000 > elapsedWaitTime ? 20000 - elapsedWaitTime : 0;
 
-		await page.waitForTimeout( remainingWaitTime );
+		if ( remainingWaitTime > 0 ) {
+			await page.waitForTimeout( remainingWaitTime );
+		}
 	}
 
 	// No need to run this test for all card types.
 	test( 'prevents adding another card for 20 seconds after a card is added', async () => {
 		await goToMyAccount( shopperPage, 'payment-methods' );
-		// Take note of the time when we added this card
+
+		// Make sure that at least 20s had already elapsed since the last card was added.
+		await waitTwentySecondsSinceLastCardAdded( shopperPage );
+
 		await addSavedCard( shopperPage, config.cards.basic, 'US', '94110' );
+		// Take note of the time when we added this card
 		timeAdded = +Date.now();
 
 		await expect(
@@ -108,7 +116,6 @@ test.describe( 'Shopper can save and delete cards', () => {
 			)
 		).not.toBeVisible();
 
-		await waitTwentySecondsSinceLastCardAdded( shopperPage );
 		// cleanup for the next tests
 		await goToMyAccount( shopperPage, 'payment-methods' );
 		await deleteSavedCard( shopperPage, config.cards.basic );
@@ -128,6 +135,9 @@ test.describe( 'Shopper can save and delete cards', () => {
 			test.describe( 'Testing card: ' + cardName, () => {
 				test( `should add the ${ cardName } card as a new payment method`, async () => {
 					await goToMyAccount( shopperPage, 'payment-methods' );
+					// Make sure that at least 20s had already elapsed since the last card was added.
+					await waitTwentySecondsSinceLastCardAdded( shopperPage );
+
 					await addSavedCard(
 						shopperPage,
 						card,
@@ -159,8 +169,6 @@ test.describe( 'Shopper can save and delete cards', () => {
 							`${ card.expires.month }/${ card.expires.year }`
 						)
 					).toBeVisible();
-
-					await waitTwentySecondsSinceLastCardAdded( shopperPage );
 				} );
 
 				test( `should be able to purchase with the saved ${ cardName } card`, async () => {
@@ -180,6 +188,9 @@ test.describe( 'Shopper can save and delete cards', () => {
 
 				test( `should be able to set the ${ cardName } card as default payment method`, async () => {
 					await goToMyAccount( shopperPage, 'payment-methods' );
+					// Make sure that at least 20s had already elapsed since the last card was added.
+					await waitTwentySecondsSinceLastCardAdded( shopperPage );
+
 					await addSavedCard( shopperPage, card2, 'US', '94110' );
 					// Take note of the time when we added this card
 					timeAdded = +Date.now();
@@ -214,13 +225,6 @@ test.describe( 'Shopper can save and delete cards', () => {
 						shopperPage.getByText( 'No saved methods found.' )
 					).toBeVisible();
 				} );
-
-				test.afterAll( async () => {
-					const cardKeys = Object.keys( cards );
-					if ( cardName !== cardKeys[ cardKeys.length - 1 ] ) {
-						waitTwentySecondsSinceLastCardAdded( shopperPage );
-					}
-				} );
 			} );
 		}
 	);

tests/e2e-pw/specs/shopper/shopper-wc-blocks-checkout-purchase.spec.ts

@@ -0,0 +1,81 @@
+/**
+ * External dependencies
+ */
+import { test, expect, Page } from '@playwright/test';
+
+/**
+ * Internal dependencies
+ */
+import {
+	checkPageExists,
+	describeif,
+	getMerchant,
+	getShopper,
+} from '../../utils/helpers';
+import { shouldRunWCBlocksTests } from '../../utils/constants';
+import { addWCBCheckoutPage } from '../../utils/merchant';
+import { goToCheckoutWCB } from '../../utils/shopper-navigation';
+import {
+	addCartProduct,
+	confirmCardAuthentication,
+	fillBillingAddressWCB,
+	fillCardDetailsWCB,
+} from '../../utils/shopper';
+import { config } from '../../config/default';
+
+describeif( shouldRunWCBlocksTests )(
+	'WooCommerce Blocks > Successful purchase',
+	() => {
+		let shopperPage: Page;
+
+		test.beforeAll( async ( { browser }, { project } ) => {
+			shopperPage = ( await getShopper( browser ) ).shopperPage;
+			if (
+				! ( await checkPageExists(
+					shopperPage,
+					project.use.baseURL + '/checkout-wcb'
+				) )
+			) {
+				const { merchantPage } = await getMerchant( browser );
+				await addWCBCheckoutPage( merchantPage );
+			}
+		} );
+
+		test( 'using a basic card', async () => {
+			await addCartProduct( shopperPage );
+			await goToCheckoutWCB( shopperPage );
+			await fillBillingAddressWCB(
+				shopperPage,
+				config.addresses.customer.billing
+			);
+			await fillCardDetailsWCB( shopperPage, config.cards.basic );
+			await shopperPage
+				.getByRole( 'button', { name: 'Place Order' } )
+				.click();
+			await expect(
+				shopperPage.getByRole( 'heading', {
+					name: 'Order received',
+				} )
+			).toBeVisible();
+		} );
+
+		test( 'using a 3DS card', async () => {
+			await addCartProduct( shopperPage );
+			await goToCheckoutWCB( shopperPage );
+			await fillBillingAddressWCB(
+				shopperPage,
+				config.addresses.customer.billing
+			);
+			await fillCardDetailsWCB( shopperPage, config.cards[ '3ds' ] );
+			await shopperPage
+				.getByRole( 'button', { name: 'Place Order' } )
+				.click();
+			await confirmCardAuthentication( shopperPage );
+			await expect(
+				shopperPage.getByRole( 'heading', {
+					name: 'Order received',
+				} )
+			).toBeVisible();
+		} );
+	}
+);