naming

Author: jycouet

packages/addons/_tests/_setup/suite.ts

@@ -130,26 +130,25 @@ export function setupTest<Addons extends AddonMap>(
 type PrepareServerOptions = {
 	cwd: string;
 	page: Page;
-	previewCommand?: string;
-	buildCommand?: string;
 	installCommand?: string;
+	beforeBuild?: () => Promise<any> | any;
+	buildCommand?: string;
+	previewCommand?: string;
 };
 // installs dependencies, builds the project, and spins up the preview server
-async function prepareServer(
-	{
-		cwd,
-		page,
-		installCommand,
-		buildCommand = 'pnpm build',
-		previewCommand = 'pnpm preview'
-	}: PrepareServerOptions,
-	afterInstall?: () => Promise<any> | any
-) {
+async function prepareServer({
+	cwd,
+	page,
+	installCommand, // should happen in the beforeAll hook
+	beforeBuild,
+	buildCommand = 'pnpm build',
+	previewCommand = 'pnpm preview'
+}: PrepareServerOptions) {
 	// install deps
 	if (installCommand) execSync(installCommand, { cwd, stdio: 'pipe' });
 
 	// ...do commands and any other extra stuff
-	await afterInstall?.();
+	await beforeBuild?.();
 
 	// build project
 	if (buildCommand) execSync(buildCommand, { cwd, stdio: 'pipe' });

packages/addons/_tests/drizzle/test.ts

@@ -68,8 +68,12 @@ test.concurrent.for(flavors)('drizzle $kind.type $variant', async (flavor, { pag
 	const pageServerPath = path.resolve(routes, `+page.server.${ts ? 'ts' : 'js'}`);
 	fs.writeFileSync(pageServerPath, pageServer, 'utf8');
 
-	const { close } = await prepareServer({ cwd, page }, () => {
-		execSync('npm run db:push', { cwd, stdio: 'pipe' });
+	const { close } = await prepareServer({
+		cwd,
+		page,
+		beforeBuild: () => {
+			execSync('npm run db:push', { cwd, stdio: 'pipe' });
+		}
 	});
 	// kill server process when we're done
 	ctx.onTestFinished(async () => await close());