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 + + 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 ); - } }