From 4bae4df057f118efcf4a16f1651e610cb37cd132 Mon Sep 17 00:00:00 2001
From: Harlan Wilton <harlan@harlanzw.com>
Date: Mon, 6 Mar 2023 23:58:02 +1100
Subject: [PATCH] chore: messing around

---
 packages/test-utils/src/nuxt.ts        | 11 --------
 packages/test-utils/src/setup/index.ts | 36 ++++++++++++++++++--------
 packages/test-utils/src/types.ts       |  5 ++++
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/packages/test-utils/src/nuxt.ts b/packages/test-utils/src/nuxt.ts
index 71cac5a147..f3d29c26e0 100644
--- a/packages/test-utils/src/nuxt.ts
+++ b/packages/test-utils/src/nuxt.ts
@@ -37,17 +37,6 @@ export const resolveRootDir = () => {
 export async function loadFixture () {
   const ctx = useTestContext()
 
-  const randomId = Math.random().toString(36).slice(2, 8)
-  const buildDir = resolve(ctx.options.rootDir, '.nuxt', randomId)
-  Object.assign(ctx.options.nuxtConfig, {
-    buildDir,
-    nitro: {
-      output: {
-        dir: resolve(buildDir, 'output')
-      }
-    }
-  })
-
   ctx.nuxt = await kit.loadNuxt({
     cwd: ctx.options.rootDir,
     dev: ctx.options.dev,
diff --git a/packages/test-utils/src/setup/index.ts b/packages/test-utils/src/setup/index.ts
index 5c63178883..b0f9d14e20 100644
--- a/packages/test-utils/src/setup/index.ts
+++ b/packages/test-utils/src/setup/index.ts
@@ -5,6 +5,8 @@ import { createBrowser } from '../browser'
 import type { TestHooks, TestOptions } from '../types'
 import setupJest from './jest'
 import setupVitest from './vitest'
+import {resolve} from "node:path";
+import {promises as fsp} from "node:fs";
 
 export const setupMaps = {
   jest: setupJest,
@@ -40,20 +42,32 @@ export function createTest (options: Partial<TestOptions>): TestHooks {
     const ctx = useTestContext()
     ctx.options.rootDir = resolveRootDir()
 
-    if (ctx.options.dev) {
+    // always output to a random build dir
+    const randomId = Math.random().toString(36).slice(2, 8)
+    const buildDir = resolve(ctx.options.rootDir, '.nuxt', randomId)
+    Object.assign(ctx.options.nuxtConfig, {
+      buildDir,
+      nitro: {
+        output: {
+          dir: resolve(buildDir, 'output')
+        }
+      }
+    })
+    await fsp.mkdir(buildDir, { recursive: true })
+
+    if (ctx.options.devServer) {
       await startDevServer()
-    } else {
-      if (ctx.options.fixture) {
-        await loadFixture()
-      }
+    }
+    if (ctx.options.fixture) {
+      await loadFixture()
+    }
 
-      if (ctx.options.build) {
-        await buildFixture()
-      }
+    if (ctx.options.build) {
+      await buildFixture()
+    }
 
-      if (ctx.options.server) {
-        await startServer()
-      }
+    if (ctx.options.server) {
+      await startServer()
     }
 
     if (ctx.options.waitFor) {
diff --git a/packages/test-utils/src/types.ts b/packages/test-utils/src/types.ts
index ab8612ff21..d9f484a5bb 100644
--- a/packages/test-utils/src/types.ts
+++ b/packages/test-utils/src/types.ts
@@ -12,7 +12,12 @@ export interface TestOptions {
   buildDir: string
   nuxtConfig: NuxtConfig
   build: boolean
+  /**
+   * @deprecated use `devServer`
+   */
   dev: boolean
+
+  devServer: boolean
   setupTimeout: number
   waitFor: number
   browser: boolean