fix tests

src/components/tests/onboarding.test.tsx

@@ -3,25 +3,15 @@ import { jest } from '@jest/globals';
 import { render, waitFor, screen } from '@testing-library/react';
 import { userEvent } from '@testing-library/user-event';
 import { Provider } from 'react-redux';
-import { useAddSite } from 'src/hooks/use-add-site';
 import { useOffline } from 'src/hooks/use-offline';
-import { FolderDialogResponse } from 'src/ipc-handlers';
 import { createTestStore } from 'src/lib/test-utils';
-import { getWordPressProvider } from 'src/lib/wordpress-provider';
 import { Onboarding } from 'src/modules/onboarding';
 import { useOnboarding } from 'src/modules/onboarding/hooks/use-onboarding';
-import { useGetWordPressVersions } from 'src/stores/wordpress-versions-api';
 
 jest.mock( 'src/modules/onboarding/hooks/use-onboarding', () => ( {
 	useOnboarding: jest.fn(),
 } ) );
 
-jest.mock( 'src/hooks/use-add-site', () => ( {
-	useAddSite: jest.fn(),
-} ) );
-
-jest.mock( 'src/hooks/use-feature-flags' );
-
 jest.mock( 'src/lib/app-globals', () => ( {
 	isMac: () => true,
 	isWindows: () => false,
@@ -31,29 +21,6 @@ jest.mock( 'src/hooks/use-offline', () => ( {
 	useOffline: jest.fn().mockReturnValue( false ),
 } ) );
 
-jest.mock( 'src/stores/wordpress-versions-api', () => {
-	const actual = jest.requireActual( 'src/stores/wordpress-versions-api' ) || {};
-	return {
-		...actual,
-		useGetWordPressVersions: jest.fn( () => ( {
-			data: [
-				{ isBeta: false, isDevelopment: false, label: '6.3', value: '6.3.3' },
-				{ isBeta: false, isDevelopment: false, label: '6.2', value: '6.2.0' },
-				{ isBeta: false, isDevelopment: false, label: '6.1', value: '6.1.7' },
-			],
-			isLoading: false,
-		} ) ),
-	};
-} );
-
-jest.mock( 'src/stores/certificate-trust-api', () => {
-	const actual = jest.requireActual( 'src/stores/certificate-trust-api' ) || {};
-	return {
-		...actual,
-		useCheckCertificateTrustQuery: jest.fn().mockReturnValue( { data: true } ),
-	};
-} );
-
 const mockSaveLastSeenVersion = jest.fn();
 
 jest.mock( 'src/stores/app-version-api', () => {
@@ -64,278 +31,71 @@ jest.mock( 'src/stores/app-version-api', () => {
 	};
 } );
 
-const mockGenerateProposedSitePath =
-	jest.fn< ( siteName: string ) => Promise< FolderDialogResponse > >();
+const mockSaveOnboarding = jest.fn();
 
 jest.mock( 'src/lib/get-ipc-api', () => ( {
-	getIpcApi: () => ( {
-		generateProposedSitePath: mockGenerateProposedSitePath.mockResolvedValue( {
-			path: '/default_path/My Site',
-			name: 'My Site',
-			isEmpty: true,
-			isWordPress: false,
-		} ),
-		promptWindowsSpeedUpSites: jest.fn(),
-		openURL: jest.fn(),
-		isCATrusted: jest.fn( () => Promise.resolve( true ) ),
-	} ),
+	getIpcApi: jest.fn( () => ( {
+		saveOnboarding: mockSaveOnboarding,
+	} ) ),
 } ) );
 
-const mockCreateSite = jest.fn();
-
 const renderWithProvider = ( children: React.ReactElement ) => {
-	const store = createTestStore( {
-		providerConstants: {
-			defaultPhpVersion: '8.3',
-			defaultWordPressVersion: 'latest',
-			allowedPhpVersions: [ '8.0', '8.1', '8.2', '8.3' ],
-			minimumWordPressVersion: '6.2.6',
-		},
-	} );
+	const store = createTestStore();
 	return render( <Provider store={ store }>{ children }</Provider> );
 };
 
 describe( 'Onboarding Component', () => {
 	const user = userEvent.setup();
-	const useAddSiteMockValue = {
-		setSiteName: jest.fn(),
-		setProposedSitePath: jest.fn(),
-		setSitePath: jest.fn(),
-		setError: jest.fn(),
-		setDoesPathContainWordPress: jest.fn(),
-		setPhpVersion: jest.fn(),
-		setWpVersion: jest.fn(),
-		siteName: 'My Site',
-		sitePath: '/path/to/my/site',
-		phpVersion: '8.3',
-		wpVersion: getWordPressProvider().DEFAULT_WORDPRESS_VERSION,
-		error: '',
-		doesPathContainWordPress: false,
-		handleAddSiteClick: jest.fn(),
-		handleSiteNameChange: jest.fn(),
-		handlePathSelectorClick: jest.fn(),
-		onSelectPath: jest.fn(),
-		setFileForImport: jest.fn(),
-		fileForImport: null,
-		isAdvancedSettingsVisible: true,
-		handleSubmit: jest.fn( () => {
-			mockCreateSite(
-				'/path/to/my/site',
-				'My Site',
-				getWordPressProvider().DEFAULT_WORDPRESS_VERSION
-			);
-		} ),
-		setUseCustomDomain: jest.fn(),
-		useCustomDomain: false,
-		customDomain: '',
-		setCustomDomain: jest.fn(),
-		setCustomDomainError: jest.fn(),
-		customDomainError: '',
-		enableHttps: false,
-		setEnableHttps: jest.fn(),
-		loadAllCustomDomains: jest.fn(),
-	};
 
 	beforeEach( () => {
 		jest.clearAllMocks();
 		mockSaveLastSeenVersion.mockResolvedValue( { data: undefined } as never );
+		mockSaveOnboarding.mockResolvedValue( undefined as never );
 		window.appGlobals = { appVersion: '1.0.0' } as typeof window.appGlobals;
 
 		( useOnboarding as jest.Mock ).mockReturnValue( {
 			needsOnboarding: true,
 		} );
-		( useAddSite as jest.Mock ).mockReturnValue( useAddSiteMockValue );
 	} );
 
 	it( 'renders onboarding screen correctly', () => {
 		const { getByText } = renderWithProvider( <Onboarding /> );
-		expect( getByText( 'Add your first site' ) ).toBeVisible();
-		expect( getByText( 'Continue' ) ).toBeVisible();
+		expect( getByText( 'Connect to your WordPress.com account' ) ).toBeVisible();
+		expect( getByText( 'Skip →' ) ).toBeVisible();
 	} );
 
 	it( 'completes onboarding when the final button is clicked', async () => {
-		const { handleAddSiteClick } = useAddSite();
-
 		const { getByText } = renderWithProvider( <Onboarding /> );
 
-		await user.click( getByText( 'Continue' ) );
-
-		await waitFor( () => expect( handleAddSiteClick ).toHaveBeenCalled() );
-	} );
-
-	it( 'should use wpVersion from useAddSite hook', () => {
-		renderWithProvider( <Onboarding /> );
-
-		const mockUseAddSite = useAddSite as jest.Mock;
-		expect( mockUseAddSite ).toHaveBeenCalled();
-		const hookResult = mockUseAddSite() as { wpVersion: string };
-		expect( hookResult.wpVersion ).toBe( getWordPressProvider().DEFAULT_WORDPRESS_VERSION );
-	} );
-
-	it( 'should fetch WordPress versions', async () => {
-		renderWithProvider( <Onboarding /> );
-
-		await waitFor( () => {
-			expect( useGetWordPressVersions ).toHaveBeenCalled();
-		} );
-	} );
-
-	it( 'should provide setWpVersion function from useAddSite hook', async () => {
-		const mockSetWpVersion = jest.fn();
-
-		( useAddSite as jest.Mock ).mockReturnValue( {
-			...useAddSiteMockValue,
-			setWpVersion: mockSetWpVersion,
-		} );
-
-		renderWithProvider( <Onboarding /> );
-
-		expect( useAddSite().setWpVersion ).toBe( mockSetWpVersion );
-	} );
-
-	it( 'should display WordPress and PHP version dropdowns', async () => {
-		renderWithProvider( <Onboarding /> );
-
-		expect( screen.getByText( 'WordPress version' ) ).toBeInTheDocument();
-		expect( screen.getByText( 'PHP version' ) ).toBeInTheDocument();
-
-		const comboboxes = screen.getAllByRole( 'combobox' );
-		expect( comboboxes.length ).toBeGreaterThanOrEqual( 2 );
-
-		const phpVersionDropdown = comboboxes[ 0 ];
-		expect( phpVersionDropdown ).toBeInTheDocument();
-
-		const wpVersionDropdown = comboboxes[ 1 ];
-		expect( wpVersionDropdown ).toBeInTheDocument();
-	} );
-
-	it( 'should allow selecting a different WordPress version', async () => {
-		const mockHandleAddSiteClick = jest.fn().mockImplementation( () => {
-			mockCreateSite( '/path/to/my/site', 'My Site', '6.3.3' );
-			return Promise.resolve();
-		} );
-
-		( useAddSite as jest.Mock ).mockReturnValue( {
-			...useAddSiteMockValue,
-			handleAddSiteClick: mockHandleAddSiteClick,
-			wpVersion: '6.3.3',
-		} );
-
-		renderWithProvider( <Onboarding /> );
-
-		const comboboxes = screen.getAllByRole( 'combobox' );
-
-		const wpVersionDropdown = comboboxes[ 1 ];
-
-		await user.selectOptions( wpVersionDropdown, '6.3.3' );
-
-		const addSiteButton = screen.getByText( 'Continue' );
-		await user.click( addSiteButton );
-
-		await waitFor( () => {
-			expect( mockHandleAddSiteClick ).toHaveBeenCalled();
-		} );
+		await user.click( getByText( 'Skip →' ) );
 
 		await waitFor( () => {
-			expect( mockCreateSite ).toHaveBeenCalledWith( '/path/to/my/site', 'My Site', '6.3.3' );
-		} );
-	} );
-
-	it( 'should allow selecting a different PHP version', async () => {
-		const mockSetPhpVersion = jest.fn();
-
-		( useAddSite as jest.Mock ).mockReturnValue( {
-			setSiteName: jest.fn(),
-			setProposedSitePath: jest.fn(),
-			setSitePath: jest.fn(),
-			setError: jest.fn(),
-			setDoesPathContainWordPress: jest.fn(),
-			setPhpVersion: mockSetPhpVersion,
-			setWpVersion: jest.fn(),
-			siteName: 'My Site',
-			sitePath: '/path/to/my/site',
-			phpVersion: '8.2', // Changed from default
-			wpVersion: getWordPressProvider().DEFAULT_WORDPRESS_VERSION,
-			error: '',
-			doesPathContainWordPress: false,
-			handleAddSiteClick: jest.fn(),
-			handleSiteNameChange: jest.fn(),
-			handlePathSelectorClick: jest.fn(),
-			onSelectPath: jest.fn(),
-			setFileForImport: jest.fn(),
-			fileForImport: null,
-			isAdvancedSettingsVisible: true,
-			handleSubmit: jest.fn(),
-			setUseCustomDomain: jest.fn(),
-			useCustomDomain: false,
-			customDomain: '',
-			setCustomDomain: jest.fn(),
-			setCustomDomainError: jest.fn(),
-			customDomainError: '',
-			enableHttps: false,
-			setEnableHttps: jest.fn(),
-			loadAllCustomDomains: jest.fn(),
+			expect( mockSaveOnboarding ).toHaveBeenCalledWith( true );
 		} );
-
-		renderWithProvider( <Onboarding /> );
-
-		const comboboxes = screen.getAllByRole( 'combobox' );
-
-		const phpVersionDropdown = comboboxes[ 0 ];
-
-		await user.selectOptions( phpVersionDropdown, '8.2' );
-
-		expect( mockSetPhpVersion ).toHaveBeenCalled();
-	} );
-
-	it( 'should disable WordPress version field when offline', () => {
-		( useOffline as jest.Mock ).mockReturnValue( true );
-
-		renderWithProvider( <Onboarding /> );
-
-		const wpVersionSelect = screen.getByLabelText( 'WordPress version' );
-		expect( wpVersionSelect ).toBeDisabled();
-	} );
-
-	it( 'should enable WordPress version field when online', () => {
-		( useOffline as jest.Mock ).mockReturnValue( false );
-
-		renderWithProvider( <Onboarding /> );
-
-		const wpVersionSelect = screen.getByLabelText( 'WordPress version' );
-		expect( wpVersionSelect ).toBeEnabled();
 	} );
 
-	it( 'should show tooltip with offline message when hovering over disabled WordPress version field', async () => {
+	it( 'should show tooltip with offline message when hovering over disabled Login button', async () => {
 		( useOffline as jest.Mock ).mockReturnValue( true );
 
 		renderWithProvider( <Onboarding /> );
 		const user = userEvent.setup();
 
-		const wpVersionSelect = screen.getByLabelText( 'WordPress version' );
-		await user.hover( wpVersionSelect );
+		const logIn = screen.getByRole( 'button', { name: 'Log in ↗' } );
+		await user.hover( logIn );
 
-		expect(
-			screen.getByText(
-				'You are currently offline so your site will be created with the latest version. Selecting a different WordPress version requires an internet connection.'
-			)
-		).toBeInTheDocument();
+		expect( screen.getByText( "You're currently offline." ) ).toBeInTheDocument();
 	} );
 
-	it( 'should not show tooltip when hovering over WordPress version field while online', async () => {
+	it( 'should not show tooltip when hovering over Login button while online', async () => {
 		( useOffline as jest.Mock ).mockReturnValue( false );
 
 		renderWithProvider( <Onboarding /> );
 		const user = userEvent.setup();
 
-		const wpVersionSelect = screen.getByLabelText( 'WordPress version' );
-		await user.hover( wpVersionSelect );
+		const logIn = screen.getByRole( 'button', { name: 'Log in ↗' } );
+		await user.hover( logIn );
 
-		expect(
-			screen.queryByText(
-				'You are currently offline so your site will be created with the latest version. Selecting a different WordPress version requires an internet connection.'
-			)
-		).not.toBeInTheDocument();
+		expect( screen.queryByText( "You're currently offline." ) ).not.toBeInTheDocument();
 	} );
 
 	it( 'should save the current app version when onboarding completes', async () => {
@@ -350,15 +110,9 @@ describe( 'Onboarding Component', () => {
 		} >( 'src/stores/app-version-api' );
 		appVersionApi.useSaveLastSeenVersionMutation.mockReturnValue( [ mockSaveLastSeenVersion ] );
 
-		const mockHandleAddSiteClick = jest.fn();
-		( useAddSite as jest.Mock ).mockReturnValue( {
-			...useAddSiteMockValue,
-			handleAddSiteClick: mockHandleAddSiteClick,
-		} );
-
 		const { getByText } = renderWithProvider( <Onboarding /> );
 
-		await user.click( getByText( 'Continue' ) );
+		await user.click( getByText( 'Skip →' ) );
 
 		await waitFor( () => {
 			expect( mockSaveLastSeenVersion ).toHaveBeenCalledWith( mockAppVersion );