Skip to content

Studio: Automatically start site after import #678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivan-ottinger merged 3 commits into from
Nov 22, 2024
Merged

Studio: Automatically start site after import #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
621cce1
Start site after import
ivan-ottinger Nov 21, 2024
8346fd0
Mock `startServer` to fix unit tests
ivan-ottinger Nov 21, 2024
cd93a5f
Test whether `startServer` was called after site import
ivan-ottinger Nov 21, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/hooks/tests/use-import-export.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ beforeEach( () => {
} );
( useSiteDetails as jest.Mock ).mockReturnValue( {
updateSite: jest.fn(),
startServer: jest.fn(),

@sejas sejas Nov 21, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think if we add a new test or at least a new assert to check we called the startServer after an import?

Something like: expect( useSiteDetails().startServer ).toHaveBeenCalledTimes( 1 );

@ivan-ottinger ivan-ottinger Nov 21, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for testing and reviewing the PR, Antonio!

What do you think if we add a new test or at least a new assert to check we called the startServer after an import?
Something like: expect( useSiteDetails().startServer ).toHaveBeenCalledTimes( 1 );

I like the idea! I have made a change in cd93a5f and also added testing whether startServer was called with the correct site ID.
stopServer: jest.fn(),
} );
} );
Expand Down Expand Up @@ -219,6 +220,8 @@ describe( 'useImportExport hook', () => {
body: 'Import completed',
} )
);
expect( useSiteDetails().startServer ).toHaveBeenCalledTimes( 1 );
expect( useSiteDetails().startServer ).toHaveBeenCalledWith( SITE_ID );
} );

it( 'shows error message when import fails', async () => {
Expand Down
4 changes: 1 addition & 3 deletions src/hooks/use-import-export.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,7 @@ export const ImportExportProvider = ( { children }: { children: React.ReactNode
} catch ( error ) {
await handleImportError( error );
} finally {
if ( wasSiteRunning ) {
await startServer( selectedSite.id );
}
await startServer( selectedSite.id );
}
},
[ importState, startServer, stopServer, updateSite ]
Expand Down