Merge pull request #3305 from woocommerce/fix/GOOWOO-519-e2e-tests-v2

Fix E2E tests

Author: joemcgill

tests/e2e/specs/onboarding-ads-only/step-2-create-campaign.test.js

@@ -416,6 +416,7 @@ test.describe( 'Create campaign for Ads only merchants', () => {
 			test.describe( 'With WooCommerce tracking disabled', () => {
 				test.beforeAll( async () => {
 					await setupAdsAccountPage.mockAdsAccountIncomplete();
+					await dashboardPage.fulfillAdsCampaignsRequest( [] );
 					await createCampaignPage.goto();
 					await createCampaignPage.clickSkipPaidAdsCreationButton();
 				} );
@@ -440,11 +441,18 @@ test.describe( 'Create campaign for Ads only merchants', () => {
 					await expect( setupSuccessModal ).toBeVisible();
 				} );
 
-				test( 'should see buttons on Dashboard for Google Ads onboarding', async () => {
-					await page.keyboard.press( 'Escape' );
-					await page
-						.getByRole( 'tab', { name: 'Dashboard' } )
-						.click();
+				test( 'should be able to close the setup success modal', async () => {
+					const closeModalButton =
+						createCampaignPage.getSetupSuccessModalCloseButton();
+					await expect( closeModalButton ).toBeVisible();
+					await expect( closeModalButton ).toBeEnabled();
+					await closeModalButton.click();
+					await expect(
+						createCampaignPage.getSetupSuccessModal()
+					).toBeHidden();
+				} );
+
+				test( 'should see Google Ads onboarding buttons on Dashboard', async () => {
 					const { addPaidCampaignButton, createCampaignButton } =
 						dashboardPage;
 

tests/e2e/specs/settings/settings.test.js

@@ -180,7 +180,13 @@ test.describe( 'Settings', () => {
 	} );
 
 	test.describe( 'YouTube Shopping', () => {
+		test.afterEach( async () => {
+			// Prevent setup/complete handlers from leaking between tests.
+			await page.unroute( /\/wc\/gla\/youtube\/setup\/complete\b/ );
+		} );
+
 		test( 'should show connect button when account is not connected', async () => {
+			await settingsPage.mockYouTubeAccountNotConnected();
 			await settingsPage.goto();
 
 			const connectButton = settingsPage.youTubeCard.getByRole(
@@ -222,9 +228,7 @@ test.describe( 'Settings', () => {
 		} );
 
 		test( 'should display error message when "Complete setup" fails', async () => {
-			await settingsPage
-				.withFulfillTimes( 1 )
-				.mockNotEligibleYouTubeChannel();
+			await settingsPage.mockNotEligibleYouTubeChannel();
 			const requestPromise =
 				settingsPage.registerYouTubeCompleteSetupRequest();
 
@@ -242,10 +246,8 @@ test.describe( 'Settings', () => {
 		} );
 
 		test( 'should complete YouTube account setup successfully', async () => {
-			await settingsPage
-				.withFulfillTimes( 1 )
-				.mockYouTubeAccountIncomplete();
 			await settingsPage.mockEligibleYouTubeChannel();
+			await settingsPage.mockYouTubeAccountIncomplete();
 			await settingsPage.goto();
 
 			const requestPromise =

tests/e2e/utils/pages/onboarding/step-3-complete-campaign.js

@@ -203,6 +203,18 @@ export default class CompleteCampaign extends MockRequests {
 		} );
 	}
 
+	/**
+	 * Retrieves the "Close" button from the setup success modal.
+	 *
+	 * @return {import('@playwright/test').Locator} Locator for the "Close" button in the setup success modal.
+	 */
+	getSetupSuccessModalCloseButton() {
+		return this.getSetupSuccessModal().getByRole( 'button', {
+			name: 'Close',
+			exact: true,
+		} );
+	}
+
 	/**
 	 * Retrieves the "Send and complete setup" button from the skip paid ads survey modal.
 	 *