revert: 456099a

__tests__/init/init.test.ts

@@ -1,21 +1,21 @@
-import fs from 'fs-extra'
-import getPort from 'get-port'
-import type { Server } from 'net'
-import path from 'path'
 import { chromium, type Browser, type Page } from 'playwright-chromium'
 import { fileURLToPath } from 'url'
-import type { ViteDevServer } from 'vite'
+import path from 'path'
+import fs from 'fs-extra'
 import {
-  ScaffoldThemeType,
+  scaffold,
   build,
   createServer,
-  scaffold,
+  serve,
-  serve
+  ScaffoldThemeType,
+  type ScaffoldOptions
 } from 'vitepress'
+import type { ViteDevServer } from 'vite'
+import type { Server } from 'net'
+import getPort from 'get-port'
 
 let browser: Browser
 let page: Page
-let server: ViteDevServer | Server
 
 beforeAll(async () => {
   browser = await chromium.connect(process.env['WS_ENDPOINT']!)
@@ -29,42 +29,14 @@ afterAll(async () => {
 
 const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), 'temp')
 
-const themes = [
+async function testVariation(options: ScaffoldOptions) {
-  ScaffoldThemeType.Default,
-  ScaffoldThemeType.DefaultCustom,
-  ScaffoldThemeType.Custom
-]
-const usingTs = [false, true]
-
-const variations = themes.flatMap((theme) =>
-  usingTs.map((useTs) => ({ theme, useTs }))
-)
-
-beforeEach(async () => {
   fs.removeSync(root)
-})
-
-afterEach(async () => {
-  if ('ws' in server) {
-    await server.close()
-  } else {
-    await new Promise<void>((resolve, reject) => {
-      server.close((error) => (error ? reject(error) : resolve()))
-    })
-  }
-  fs.removeSync(root)
-})
-
-test.each(variations)(
-  '$theme (TypeScript: $useTs)',
-  async ({ theme, useTs }) => {
   scaffold({
-      root,
+    ...options,
-      theme,
+    root
-      useTs,
-      injectNpmScripts: false
   })
 
+  let server: ViteDevServer | Server
   const port = await getPort()
 
   async function goto(path: string) {
@@ -80,6 +52,7 @@ test.each(variations)(
     await server!.listen()
   }
 
+  try {
     await goto('/')
     expect(await page.textContent('h1')).toMatch('My Awesome Project')
 
@@ -93,5 +66,33 @@ test.each(variations)(
     await page.click('a[href="/api-examples.html"]')
     await page.waitForSelector('pre code')
     expect(await page.textContent('h1')).toMatch('Runtime API Examples')
+  } finally {
+    fs.removeSync(root)
+    if ('ws' in server) {
+      await server.close()
+    } else {
+      await new Promise<void>((resolve, reject) => {
+        server.close((error) => (error ? reject(error) : resolve()))
+      })
+    }
+  }
+}
+
+const themes = [
+  ScaffoldThemeType.Default,
+  ScaffoldThemeType.DefaultCustom,
+  ScaffoldThemeType.Custom
+]
+const usingTs = [false, true]
+
+for (const theme of themes) {
+  for (const useTs of usingTs) {
+    test(`${theme}${useTs ? ` + TypeScript` : ``}`, () =>
+      testVariation({
+        root: '.',
+        theme,
+        useTs,
+        injectNpmScripts: false
+      }))
+  }
 }
-)