Revert "Opti tests, no need preview when page not requested."

This reverts commit 52961f0.

Author: jycouet

packages/addons/_tests/_setup/suite.ts

@@ -117,8 +117,6 @@ async function prepareServer(
 	if (buildCommand) execSync(buildCommand, { cwd, stdio: 'pipe' });
 
 	// start preview server
-	if (!previewCommand) return { url: null, close: () => {} };
-
 	const { url, close } = await startPreview({ cwd, command: previewCommand });
 
 	// increases timeout as 30s is not always enough when running the full suite

packages/addons/_tests/all-addons/test.ts

@@ -22,7 +22,7 @@ const kitOnly = variants.filter((v) => v.startsWith('kit'));
 test.concurrent.for(kitOnly)('run all addons - %s', async (variant, { page, ...ctx }) => {
 	const cwd = await ctx.run(variant, defaultOptions);
 
-	const { close } = await prepareServer({ cwd, page, previewCommand: null! });
+	const { close } = await prepareServer({ cwd, page });
 	// kill server process when we're done
 	ctx.onTestFinished(async () => await close());
 

packages/addons/_tests/devtools-json/test.ts

@@ -8,11 +8,10 @@ const { test, variants, prepareServer } = setupTest({ devtoolsJson } as {
 	devtoolsJson?: typeof devtoolsJson;
 });
 
-const kitOnly = variants.filter((v) => v.includes('kit'));
-test.concurrent.for(kitOnly)('default - %s', async (variant, { page, ...ctx }) => {
+test.concurrent.for(variants)('default - %s', async (variant, { page, ...ctx }) => {
 	const cwd = await ctx.run(variant, { devtoolsJson: {} });
 
-	const { close } = await prepareServer({ cwd, page, previewCommand: null! });
+	const { close } = await prepareServer({ cwd, page });
 	// kill server process when we're done
 	ctx.onTestFinished(async () => await close());
 
@@ -27,3 +26,25 @@ test.concurrent.for(kitOnly)('default - %s', async (variant, { page, ...ctx }) =
 	// Check if it's called
 	expect(viteContent).toContain(`devtoolsJson()`);
 });
+
+test.concurrent.for(variants)(
+	'without selecting the addon specifically - %s',
+	async (variant, { page, ...ctx }) => {
+		const cwd = await ctx.run(variant, {});
+
+		const { close } = await prepareServer({ cwd, page });
+		// kill server process when we're done
+		ctx.onTestFinished(async () => await close());
+
+		const ext = variant.includes('ts') ? 'ts' : 'js';
+		const viteFile = path.resolve(cwd, `vite.config.${ext}`);
+		const viteContent = fs.readFileSync(viteFile, 'utf8');
+
+		// Check if we have the import part
+		expect(viteContent).toContain(`import devtoolsJson from`);
+		expect(viteContent).toContain(`vite-plugin-devtools-json`);
+
+		// Check if it's called
+		expect(viteContent).toContain(`devtoolsJson()`);
+	}
+);

packages/addons/_tests/eslint/test.ts

@@ -10,7 +10,7 @@ const { test, variants, prepareServer } = setupTest({ eslint });
 test.concurrent.for(variants)('core - %s', async (variant, { page, ...ctx }) => {
 	const cwd = await ctx.run(variant, { eslint: {} });
 
-	const { close } = await prepareServer({ cwd, page, previewCommand: null! });
+	const { close } = await prepareServer({ cwd, page });
 	// kill server process when we're done
 	ctx.onTestFinished(async () => await close());
 

packages/addons/_tests/lucia/test.ts

@@ -12,7 +12,7 @@ test.concurrent.for(kitOnly)('core - %s', async (variant, { page, ...ctx }) => {
 		lucia: { demo: true }
 	});
 
-	const { close } = await prepareServer({ cwd, page, previewCommand: null! });
+	const { close } = await prepareServer({ cwd, page });
 	// kill server process when we're done
 	ctx.onTestFinished(async () => await close());
 

packages/addons/_tests/paraglide/test.ts

@@ -8,7 +8,7 @@ const kitOnly = variants.filter((v) => v.includes('kit'));
 test.concurrent.for(kitOnly)('core - %s', async (variant, { page, ...ctx }) => {
 	const cwd = await ctx.run(variant, { paraglide: { demo: true, languageTags: 'en' } });
 
-	const { close } = await prepareServer({ cwd, page, previewCommand: null! });
+	const { close } = await prepareServer({ cwd, page });
 	// kill server process when we're done
 	ctx.onTestFinished(async () => await close());
 

packages/addons/_tests/playwright/test.ts

@@ -7,7 +7,7 @@ const { test, variants, prepareServer } = setupTest({ playwright });
 test.concurrent.for(variants)('core - %s', async (variant, { page, ...ctx }) => {
 	const cwd = await ctx.run(variant, { playwright: {} });
 
-	const { close } = await prepareServer({ cwd, page, previewCommand: null! });
+	const { close } = await prepareServer({ cwd, page });
 	// kill server process when we're done
 	ctx.onTestFinished(async () => await close());
 

packages/addons/_tests/prettier/test.ts

@@ -10,7 +10,7 @@ const { test, variants, prepareServer } = setupTest({ prettier });
 test.concurrent.for(variants)('core - %s', async (variant, { page, ...ctx }) => {
 	const cwd = await ctx.run(variant, { prettier: {} });
 
-	const { close } = await prepareServer({ cwd, page, previewCommand: null! });
+	const { close } = await prepareServer({ cwd, page });
 	// kill server process when we're done
 	ctx.onTestFinished(async () => await close());
 

packages/addons/_tests/sveltekit-adapter/test.ts

@@ -8,10 +8,10 @@ const addonId = sveltekitAdapter.id;
 const { test, variants, prepareServer } = setupTest({ [addonId]: sveltekitAdapter });
 
 const kitOnly = variants.filter((v) => v.includes('kit'));
-test.concurrent.for(kitOnly)('core node - %s', async (variant, { page, ...ctx }) => {
+test.concurrent.for(kitOnly)('core - %s', async (variant, { page, ...ctx }) => {
 	const cwd = await ctx.run(variant, { [addonId]: { adapter: 'node' } });
 
-	const { close } = await prepareServer({ cwd, page, previewCommand: null! });
+	const { close } = await prepareServer({ cwd, page });
 	// kill server process when we're done
 	ctx.onTestFinished(async () => await close());
 
@@ -21,10 +21,13 @@ test.concurrent.for(kitOnly)('core node - %s', async (variant, { page, ...ctx })
 	);
 });
 
-test.concurrent.for(kitOnly)('core auto - %s', async (variant, { ...ctx }) => {
+test.concurrent.for(kitOnly)('core - %s', async (variant, { page, ...ctx }) => {
 	const cwd = await ctx.run(variant, { [addonId]: { adapter: 'auto' } });
 
-	// Check only generated files.
+	const { close } = await prepareServer({ cwd, page });
+	// kill server process when we're done
+	ctx.onTestFinished(async () => await close());
+
 	expect(await readFile(join(cwd, 'svelte.config.js'), 'utf8')).toMatch('adapter-auto');
 	expect(await readFile(join(cwd, 'svelte.config.js'), 'utf8')).toMatch(
 		'adapter-auto only supports some environments'

packages/addons/_tests/vitest/test.ts

@@ -8,7 +8,7 @@ const { test, variants, prepareServer } = setupTest({ vitest });
 test.concurrent.for(variants)('core - %s', async (variant, { page, ...ctx }) => {
 	const cwd = await ctx.run(variant, { vitest: {} });
 
-	const { close } = await prepareServer({ cwd, page, previewCommand: null! });
+	const { close } = await prepareServer({ cwd, page });
 
 	execSync('pnpm exec playwright install chromium', { cwd, stdio: 'pipe' });
 	execSync('pnpm test', { cwd, stdio: 'pipe' });