From 5ea01953d980c40148568fe99684402d5ef78ebd Mon Sep 17 00:00:00 2001
From: Adrian Moldovan <adim.moldovan@gmail.com>
Date: Mon, 9 Jan 2023 19:18:15 +0200
Subject: [PATCH 1/2] Remove selection of complete plan in connection flow as
 it's broken and not used anywhere anyway.

---
 .../e2e/specs/connection/connection.test.js   |  2 +-
 tools/e2e-commons/flows/jetpack-connect.js    |  6 +++---
 tools/e2e-commons/pages/wpcom/pick-a-plan.js  | 19 +++++--------------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/projects/plugins/jetpack/tests/e2e/specs/connection/connection.test.js b/projects/plugins/jetpack/tests/e2e/specs/connection/connection.test.js
index f64fb3b3181be..bea7d65500ef1 100644
--- a/projects/plugins/jetpack/tests/e2e/specs/connection/connection.test.js
+++ b/projects/plugins/jetpack/tests/e2e/specs/connection/connection.test.js
@@ -36,7 +36,7 @@ test.describe( 'Connection', () => {
 
 	test( 'Classic', async ( { page } ) => {
 		await test.step( 'Can start classic connection', async () => {
-			await doClassicConnection( page, true );
+			await doClassicConnection( page );
 		} );
 
 		await test.step( 'Can assert that site is connected', async () => {
diff --git a/tools/e2e-commons/flows/jetpack-connect.js b/tools/e2e-commons/flows/jetpack-connect.js
index 907010e14a95c..5e18e61267c79 100644
--- a/tools/e2e-commons/flows/jetpack-connect.js
+++ b/tools/e2e-commons/flows/jetpack-connect.js
@@ -19,16 +19,16 @@ import { expect } from '@playwright/test';
 
 const cardCredentials = config.get( 'testCardCredentials' );
 
-export async function doClassicConnection( page, freePlan = true ) {
+export async function doClassicConnection( page, plan = 'free' ) {
 	const jetpackPage = await JetpackPage.init( page );
 	await jetpackPage.connect();
 	await ( await AuthorizePage.init( page ) ).approve();
 
-	if ( freePlan ) {
+	if ( plan === 'free' ) {
 		await ( await PickAPlanPage.init( page ) ).select( 'free' );
 		await RecommendationsPage.init( page );
 	} else {
-		await ( await PickAPlanPage.init( page ) ).select( 'complete' );
+		await ( await PickAPlanPage.init( page ) ).select( plan );
 		await ( await CheckoutPage.init( page ) ).processPurchase( cardCredentials );
 		await ( await ThankYouPage.init( page ) ).waitForSetupAndProceed();
 	}
diff --git a/tools/e2e-commons/pages/wpcom/pick-a-plan.js b/tools/e2e-commons/pages/wpcom/pick-a-plan.js
index a7ee8513ed4a5..4dfc602d79d70 100644
--- a/tools/e2e-commons/pages/wpcom/pick-a-plan.js
+++ b/tools/e2e-commons/pages/wpcom/pick-a-plan.js
@@ -1,4 +1,5 @@
 import WpPage from '../wp-page.js';
+import logger from '../../logger.cjs';
 
 export default class PickAPlanPage extends WpPage {
 	constructor( page ) {
@@ -10,22 +11,12 @@ export default class PickAPlanPage extends WpPage {
 
 	async select( product = 'free' ) {
 		switch ( product ) {
-			case 'complete':
-				return await this.selectComplete();
 			case 'free':
+				const freePlanButton = '.jetpack-product-store__jetpack-free a';
+				await this.click( freePlanButton );
+				break;
 			default:
-				return await this.selectFreePlan();
+				logger.error( `Selecting plan '${ product }' is not implemented! Add it yourself?` );
 		}
 	}
-
-	async selectFreePlan() {
-		const freePlanButton = '.jetpack-product-store__jetpack-free a';
-		return await this.click( freePlanButton );
-	}
-
-	async selectComplete() {
-		const buttonSelector =
-			'div[data-e2e-product-slug="jetpack_complete"] [class*="summary"] button';
-		return await this.click( buttonSelector );
-	}
 }

From b28145d10426027dcabf5563953fff8b70e29b98 Mon Sep 17 00:00:00 2001
From: Adrian Moldovan <adim.moldovan@gmail.com>
Date: Mon, 9 Jan 2023 19:20:25 +0200
Subject: [PATCH 2/2] Remove selection of complete plan in connection flow as
 it's broken and not used anywhere anyway.

---
 .../jetpack/changelog/e2e-remove-complete-plan-selection     | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 projects/plugins/jetpack/changelog/e2e-remove-complete-plan-selection

diff --git a/projects/plugins/jetpack/changelog/e2e-remove-complete-plan-selection b/projects/plugins/jetpack/changelog/e2e-remove-complete-plan-selection
new file mode 100644
index 0000000000000..4adf82cf4b0c2
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/e2e-remove-complete-plan-selection
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: small e2e test update
+
+