Add Pre-Orders E2E Shortcode/Blocks Tests

tests/e2e/bin/setup.sh

@@ -155,12 +155,32 @@ rm -rf $E2E_ROOT/woocommerce-subscriptions.zip
 
 redirect_output cli wp plugin activate woocommerce-subscriptions
 
+step "Installing Woo Pre-Orders"
+echo " - Fetching latest version"
+LATEST_RELEASE_ASSET_ID=$(curl -sH "Authorization: token $GITHUB_TOKEN" https://api.github.com/repos/woocommerce/woocommerce-pre-orders/releases/latest | jq -r '.assets[0].id')
+
+redirect_output curl -sLJ \
+	-H "Authorization: token $GITHUB_TOKEN" \
+	-H "Accept: application/octet-stream" \
+	--output $E2E_ROOT/woocommerce-pre-orders.zip \
+	https://api.github.com/repos/woocommerce/woocommerce-pre-orders/releases/assets/"$LATEST_RELEASE_ASSET_ID"
+
+echo " - Installing"
+redirect_output cli wp plugin install /var/www/html/wp-content/plugins/woocommerce-gateway-stripe/tests/e2e/woocommerce-pre-orders.zip --force
+
+echo " - Removing lingering zip"
+rm -rf $E2E_ROOT/woocommerce-pre-orders.zip
+
+echo " - Activating"
+redirect_output cli wp plugin activate woocommerce-pre-orders
+
 echo
 echo "============================================================"
 echo "WordPress     => $(cli wp core version)"
 echo "WooCommerce   => $(cli wp plugin get woocommerce --field=version)"
 echo "Stripe        => $(cli wp plugin get woocommerce-gateway-stripe --field=version)"
 echo "Subscriptions => $(cli wp plugin get woocommerce-subscriptions --field=version)"
+echo "Pre-Orders    => $(cli wp plugin get woocommerce-pre-orders --field=version)"
 echo "============================================================"
 echo
 step "E2E environment up and running at http://localhost:8088/wp-admin/"

tests/e2e/config/global-setup.js

@@ -8,8 +8,6 @@ import {
 	installPluginFromRepository,
 	setupWoo,
 	setupStripe,
-	installWooSubscriptionsFromRepo,
-	checkWooGutenbergProductsBlockVersion,
 } from '../utils/playwright-setup';
 
 dotenv.config( {
@@ -21,6 +19,7 @@ const {
 	ADMIN_USER,
 	ADMIN_PASSWORD,
 	PLUGIN_VERSION,
+	PLUGIN_REPOSITORY,
 	WOO_SETUP,
 	STRIPE_SETUP,
 	STRIPE_PUB_KEY,
@@ -38,6 +37,41 @@ function wait( milliseconds ) {
 	} );
 }
 
+/**
+ * Install plugins from the respective repositories.
+ *
+ * @param {Page} page Playwright page fixture.
+ *
+ * @returns {Promise<unknown>}
+ */
+async function installPlugins( page ) {
+	let pluginSlug;
+
+	try {
+		// Install WooCommerce Subscriptions.
+		pluginSlug = 'woocommerce-subscriptions';
+		await installPluginFromRepository(
+			page,
+			`woocommerce/${ pluginSlug }`,
+			pluginSlug
+		);
+		// Install WooCommerce Pre-Orders.
+		pluginSlug = 'woocommerce-pre-orders';
+		await installPluginFromRepository(
+			page,
+			`woocommerce/${ pluginSlug }`,
+			pluginSlug
+		);
+	} catch ( e ) {
+		console.error( e );
+		console.error(
+			`Cannot proceed e2e test, as we could not install ${ pluginSlug }.`,
+			'Please check if the GITHUB_TOKEN env variable is valid.'
+		);
+		process.exit( 1 );
+	}
+}
+
 module.exports = async ( config ) => {
 	console.time( 'Total Setup Time' );
 	const { stateDir, baseURL, userAgent } = config.projects[ 0 ].use;
@@ -125,13 +159,13 @@ module.exports = async ( config ) => {
 	} )
 		.then( async () => {
 			const apiTokensPage = await adminContext.newPage();
-			const updatePluginPage = await adminContext.newPage();
-			const wooSubscriptionsInstallPage = await adminContext.newPage();
+			const pluginsInstallPage01 = await adminContext.newPage();
+			const pluginsInstallPage02 = await adminContext.newPage();
 
 			// create consumer token and update plugin in parallel.
 			let restApiKeysFinished = false;
 			let pluginUpdateFinished = false;
-			let wooSubscriptionsInstallFinished = false;
+			let pluginsInstallFinished = false;
 			let stripeSetupFinished = false;
 
 			createApiTokens( apiTokensPage )
@@ -146,14 +180,20 @@ module.exports = async ( config ) => {
 				} );
 
 			if ( PLUGIN_VERSION ) {
-				installPluginFromRepository( updatePluginPage )
+				installPluginFromRepository(
+					pluginsInstallPage01,
+					PLUGIN_REPOSITORY,
+					'woocommerce-gateway-stripe',
+					PLUGIN_VERSION
+				)
 					.then( () => {
 						pluginUpdateFinished = true;
 					} )
 					.catch( ( e ) => {
 						console.error( e );
 						console.error(
-							'Cannot proceed e2e test, as we could not update the plugin. Please check if the test site has been setup correctly.'
+							'Cannot proceed with e2e tests, as the plugin could not be installed.',
+							'Please check if the site has been setup correctly.'
 						);
 						process.exit( 1 );
 					} );
@@ -165,22 +205,15 @@ module.exports = async ( config ) => {
 			}
 
 			if ( WOO_SETUP && GITHUB_TOKEN ) {
-				installWooSubscriptionsFromRepo( wooSubscriptionsInstallPage )
-					.then( () => {
-						wooSubscriptionsInstallFinished = true;
-					} )
-					.catch( ( e ) => {
-						console.error( e );
-						console.error(
-							'Cannot proceed e2e test, as we could not install WooCommerce Subscriptions. Please check if the GITHUB_TOKEN env variable is valid.'
-						);
-						process.exit( 1 );
-					} );
+				installPlugins( pluginsInstallPage02 ).then( () => {
+					pluginsInstallFinished = true;
+				} );
 			} else {
 				console.log(
-					'Skipping WC Subscriptions setup. The version already installed on the test site will be used if needed.'
+					'Skipping plugins installation.',
+					'The plugin versions pre-installed on the site will be used, if needed.'
 				);
-				wooSubscriptionsInstallFinished = true;
+				pluginsInstallFinished = true;
 			}
 
 			if ( STRIPE_SETUP ) {
@@ -210,7 +243,7 @@ module.exports = async ( config ) => {
 				! pluginUpdateFinished ||
 				! restApiKeysFinished ||
 				! stripeSetupFinished ||
-				! wooSubscriptionsInstallFinished
+				! pluginsInstallFinished
 			) {
 				await wait( 1000 );
 			}

tests/e2e/test-data/default.json

@@ -22,6 +22,10 @@
 		"subscription": {
 			"name": "Subscription Product",
 			"type": "subscription"
+		},
+		"pre-order": {
+			"name": "Pre-Order Product",
+			"type": "simple"
 		}
 	},
 	"addresses": {

tests/e2e/tests/_legacy-experience/checkout/subscription-product.spec.js

@@ -1,6 +1,6 @@
 import { test, expect } from '@playwright/test';
 import config from 'config';
-import { payments, api } from '../../../utils';
+import { api, payments, products } from '../../../utils';
 
 const {
 	setupShortcodeCheckout,
@@ -10,22 +10,7 @@ const {
 let productId;
 
 test.beforeAll( async () => {
-	const product = {
-		...config.get( 'products.subscription' ),
-		regular_price: '9.99',
-		meta_data: [
-			{
-				key: '_subscription_period',
-				value: 'month',
-			},
-			{
-				key: '_subscription_period_interval',
-				value: '1',
-			},
-		],
-	};
-
-	productId = await api.create.product( product );
+	productId = await api.create.product( products.subscriptionData() );
 } );
 
 test.afterAll( async () => {

tests/e2e/tests/_legacy-experience/subscriptions/subscription-renewal.spec.js

@@ -1,6 +1,6 @@
 import { test, expect } from '@playwright/test';
 import config from 'config';
-import { payments, api, user } from '../../../utils';
+import { api, payments, products, user } from '../../../utils';
 
 const {
 	setupShortcodeCheckout,
@@ -25,22 +25,7 @@ test.beforeAll( async () => {
 
 	await api.create.customer( user );
 
-	const product = {
-		...config.get( 'products.subscription' ),
-		regular_price: '9.99',
-		meta_data: [
-			{
-				key: '_subscription_period',
-				value: 'month',
-			},
-			{
-				key: '_subscription_period_interval',
-				value: '1',
-			},
-		],
-	};
-
-	productId = await api.create.product( product );
+	productId = await api.create.product( products.subscriptionData() );
 } );
 
 test.afterAll( async () => {

tests/e2e/tests/_legacy-experience/woocommerce-blocks/subscription-product.spec.js

@@ -1,28 +1,13 @@
 import { test, expect } from '@playwright/test';
 import config from 'config';
-import { payments, api } from '../../../utils';
+import { api, payments, products } from '../../../utils';
 
 const { setupBlocksCheckout, fillCreditCardDetailsLegacy } = payments;
 
 let productId;
 
 test.beforeAll( async () => {
-	const product = {
-		...config.get( 'products.subscription' ),
-		regular_price: '9.99',
-		meta_data: [
-			{
-				key: '_subscription_period',
-				value: 'month',
-			},
-			{
-				key: '_subscription_period_interval',
-				value: '1',
-			},
-		],
-	};
-
-	productId = await api.create.product( product );
+	productId = await api.create.product( products.subscriptionData() );
 } );
 
 test.afterAll( async () => {

tests/e2e/tests/checkout/blocks/pre-order-product.spec.js

@@ -0,0 +1,48 @@
+import { test, expect } from '@playwright/test';
+import config from 'config';
+import { api, payments, products } from '../../../utils';
+import { isPluginInstalled } from '../../../utils/plugin-utils';
+
+const { setupBlocksCheckout, fillCreditCardDetails } = payments;
+
+let productId;
+
+test.skip( async () => {
+	return ! ( await isPluginInstalled( 'woocommerce-pre-orders' ) );
+}, 'Woo Pre-Orders plugin is not active. Skipping tests.' );
+
+test.beforeAll( async () => {
+	productId = await api.create.product( products.preOrderData() );
+} );
+
+test.afterAll( async () => {
+	if ( ! productId ) {
+		return;
+	}
+
+	await api.deletePost.product( productId );
+} );
+
+test( 'customer can purchase a pre-order product @blocks @pre-orders', async ( {
+	page,
+} ) => {
+	await page.goto( `?p=${ productId }` );
+	await page.locator( 'button[name="add-to-cart"]' ).click();
+
+	// Subscriptions will create an account for this checkout, we need a random email.
+	const customerData = {
+		...config.get( 'addresses.customer.billing' ),
+		email:
+			Date.now() + '+' + config.get( 'addresses.customer.billing.email' ),
+	};
+
+	await setupBlocksCheckout( page, customerData );
+	await fillCreditCardDetails( page, config.get( 'cards.no-3ds' ) );
+
+	await page.locator( 'text="Place Order"' ).click();
+	await page.waitForURL( '**/checkout/order-received/**' );
+
+	await expect( page.locator( 'h1.entry-title' ) ).toHaveText(
+		'Order received'
+	);
+} );

tests/e2e/tests/checkout/blocks/subscription-product.spec.js

@@ -1,28 +1,13 @@
 import { test, expect } from '@playwright/test';
 import config from 'config';
-import { payments, api } from '../../../utils';
+import { api, payments, products } from '../../../utils';
 
 const { setupBlocksCheckout, fillCreditCardDetails } = payments;
 
 let productId;
 
 test.beforeAll( async () => {
-	const product = {
-		...config.get( 'products.subscription' ),
-		regular_price: '9.99',
-		meta_data: [
-			{
-				key: '_subscription_period',
-				value: 'month',
-			},
-			{
-				key: '_subscription_period_interval',
-				value: '1',
-			},
-		],
-	};
-
-	productId = await api.create.product( product );
+	productId = await api.create.product( products.subscriptionData() );
 } );
 
 test.afterAll( async () => {