fix e2e

e2e/blueprints.test.ts

@@ -16,8 +16,7 @@ test.describe( 'Blueprints', () => {
 
 		// Complete onboarding before tests
 		const onboarding = new Onboarding( session.mainWindow );
-		await expect( onboarding.heading ).toBeVisible();
-		await onboarding.continueButton.click();
+		await onboarding.completeOnboarding();
 
 		const whatsNewModal = new WhatsNewModal( session.mainWindow );
 		if ( await whatsNewModal.locator.isVisible( { timeout: 5000 } ) ) {

e2e/import-export.test.ts

@@ -19,8 +19,7 @@ test.describe( 'Import / Export', () => {
 
 		// Complete onboarding before tests
 		const onboarding = new Onboarding( session.mainWindow );
-		await expect( onboarding.heading ).toBeVisible();
-		await onboarding.continueButton.click();
+		await onboarding.completeOnboarding();
 
 		const whatsNewModal = new WhatsNewModal( session.mainWindow );
 		if ( await whatsNewModal.locator.isVisible( { timeout: 5000 } ) ) {

e2e/import.test.ts

@@ -31,8 +31,7 @@ test.describe( 'Import', () => {
 
 		// Complete onboarding before tests
 		const onboarding = new Onboarding( session.mainWindow );
-		await expect( onboarding.heading ).toBeVisible();
-		await onboarding.continueButton.click();
+		await onboarding.completeOnboarding();
 
 		const whatsNewModal = new WhatsNewModal( session.mainWindow );
 		if ( await whatsNewModal.locator.isVisible( { timeout: 5000 } ) ) {

e2e/localization.test.ts

@@ -45,8 +45,7 @@ test.describe( 'Localization', () => {
 
 		// Complete onboarding before tests
 		const onboarding = new Onboarding( session.mainWindow );
-		await expect( onboarding.heading ).toBeVisible();
-		await onboarding.continueButton.click();
+		await onboarding.completeOnboarding();
 
 		const whatsNewModal = new WhatsNewModal( session.mainWindow );
 		if ( await whatsNewModal.locator.isVisible( { timeout: 5000 } ) ) {
@@ -96,7 +95,7 @@ test.describe( 'Localization', () => {
 		try {
 			const visible = await onboarding.heading.isVisible( { timeout: 2000 } );
 			if ( visible ) {
-				await onboarding.continueButton.click();
+				await onboarding.skipButton.click();
 			}
 		} catch ( error ) {
 			// Onboarding not visible, continue with test

e2e/overview-customize-links.test.ts

@@ -1,5 +1,6 @@
 import { test, expect, type Page } from '@playwright/test';
 import { E2ESession } from './e2e-helpers';
+import MainSidebar from './page-objects/main-sidebar';
 import Onboarding from './page-objects/onboarding';
 import SiteContent from './page-objects/site-content';
 import WhatsNewModal from './page-objects/whats-new-modal';
@@ -76,8 +77,12 @@ test.describe( 'Overview customize links', () => {
 
 			const onboarding = new Onboarding( session.mainWindow );
 			await expect( onboarding.heading ).toBeVisible();
-			await onboarding.siteNameInput.fill( siteName );
-			await onboarding.continueButton.click();
+			await onboarding.skipButton.click();
+			const sidebar = new MainSidebar( session.mainWindow );
+			const modal = await sidebar.openAddSiteModal();
+			await modal.createSiteButton.click();
+			await modal.siteNameInput.fill( siteName );
+			await modal.continueButton.click();
 
 			const whatsNewModal = new WhatsNewModal( session.mainWindow );
 			if ( await whatsNewModal.locator.isVisible( { timeout: 5000 } ) ) {

e2e/page-objects/add-site-modal.ts

@@ -50,8 +50,8 @@ export default class AddSiteModal {
 		return this.page.getByTestId( 'stepper-action-button' );
 	}
 
-	async selectLocalPathForTesting() {
-		await this.siteForm.clickLocalPathButtonAndSelectFromEnv();
+	async selectLocalPathForTesting( partialExpectedPath: string ) {
+		await this.siteForm.clickLocalPathButtonAndSelectFromEnv( partialExpectedPath );
 	}
 
 	async selectBlueprintFile( filePath: string ) {

e2e/page-objects/onboarding.ts

@@ -1,5 +1,6 @@
 import { type Page } from '@playwright/test';
-import SiteForm from './site-form';
+import { expect } from '@playwright/test';
+import MainSidebar from './main-sidebar';
 
 export default class Onboarding {
 	constructor( private page: Page ) {}
@@ -8,27 +9,20 @@ export default class Onboarding {
 		return this.page.getByTestId( 'onboarding' );
 	}
 
-	private get siteForm() {
-		return new SiteForm( this.page );
-	}
-
 	get heading() {
-		return this.locator.getByRole( 'heading', { name: 'Add your first site' } );
-	}
-
-	get siteNameInput() {
-		return this.siteForm.siteNameInput;
-	}
-
-	get localPathInput() {
-		return this.siteForm.localPathInput;
+		return this.locator.getByRole( 'heading', { name: 'Connect to your WordPress.com account' } );
 	}
 
-	get continueButton() {
-		return this.locator.getByRole( 'button', { name: /Continue|Add site/ } );
+	get skipButton() {
+		return this.locator.getByRole( 'button', { name: 'Skip →' } );
 	}
 
-	async selectLocalPathForTesting( partialExpectedPath: string ) {
-		await this.siteForm.clickLocalPathButtonAndSelectFromEnv( partialExpectedPath );
+	async completeOnboarding() {
+		await expect( this.heading ).toBeVisible();
+		await this.skipButton.click();
+		const sidebar = new MainSidebar( this.page );
+		const modal = await sidebar.openAddSiteModal();
+		await modal.createSiteButton.click();
+		await modal.continueButton.click();
 	}
 }

e2e/sites.test.ts

@@ -31,19 +31,24 @@ test.describe( 'Servers', () => {
 
 		const onboarding = new Onboarding( session.mainWindow );
 
+		await onboarding.skipButton.click();
+
+		const sidebar = new MainSidebar( session.mainWindow );
+		const modal = await sidebar.openAddSiteModal();
+		await modal.createSiteButton.click();
+
 		if ( customSiteName ) {
-			await onboarding.siteNameInput.fill( customSiteName );
+			await modal.siteNameInput.fill( customSiteName );
 		}
-		await expect( onboarding.siteNameInput ).toHaveValue( /\S+/, { timeout: 5000 } );
-		const siteName = await onboarding.siteNameInput.inputValue();
+		await expect( modal.siteNameInput ).toHaveValue( /\S+/, { timeout: 5000 } );
+		const siteName = await modal.siteNameInput.inputValue();
 
 		if ( customFolderName ) {
-			await onboarding.selectLocalPathForTesting( customFolderName );
+			await modal.selectLocalPathForTesting( customFolderName );
 		}
-		const localPath = await onboarding.localPathInput.inputValue();
+		const localPath = await modal.localPathInput.inputValue();
 
-		await expect( onboarding.heading ).toBeVisible();
-		await onboarding.continueButton.click();
+		await modal.continueButton.click();
 
 		await closeWhatsNew();