fix(vitest): correctly override api with --no-api flag (#5386)

sheremet-va · web-flow · commit 51d1d47263e8 · 2024-03-14T19:08:56.000+01:00
diff --git a/examples/playwright/test/basic.test.ts b/examples/playwright/test/basic.test.ts
@@ -20,9 +20,10 @@ describe.runIf(process.platform !== 'win32')('basic', async () => {
   })
 
   afterAll(async () => {
-    await browser.close()
+    // hook timed out and we already have another error
+    await browser?.close()
     await new Promise<void>((resolve, reject) => {
-      server.httpServer.close(error => error ? reject(error) : resolve())
+      server?.httpServer.close(error => error ? reject(error) : resolve())
     })
   })
 
diff --git a/packages/vitest/src/node/plugins/index.ts b/packages/vitest/src/node/plugins/index.ts
@@ -45,8 +45,8 @@ export async function VitestPlugin(options: UserConfig = {}, ctx = new Vitest('t
         const testConfig = deepMerge(
           {} as UserConfig,
           configDefaults,
-          options,
           removeUndefinedValues(viteConfig.test ?? {}),
+          options,
         )
         testConfig.api = resolveApiServerConfig(testConfig)
 
diff --git a/test/config/test/resolution.test.ts b/test/config/test/resolution.test.ts
@@ -235,3 +235,31 @@ describe('correctly defines inline and noExternal flags', async () => {
     ])
   })
 })
+
+describe('correctly defines api flag', () => {
+  it('CLI overrides disabling api', async () => {
+    const c = await vitest({ api: false }, {
+      api: {
+        port: 1234,
+      },
+      watch: true,
+    })
+    expect(c.server.config.server.middlewareMode).toBe(true)
+    expect(c.config.api).toEqual({
+      middlewareMode: true,
+    })
+  })
+
+  it('CLI overrides inlined value', async () => {
+    const c = await vitest({ api: { port: 4321 } }, {
+      api: {
+        port: 1234,
+      },
+      watch: true,
+    })
+    expect(c.server.config.server.port).toBe(4321)
+    expect(c.config.api).toEqual({
+      port: 4321,
+    })
+  })
+})

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ export async function VitestPlugin(options: UserConfig = {}, ctx = new Vitest('t`
`45`	`45`	`const testConfig = deepMerge(`
`46`	`46`	`{} as UserConfig,`
`47`	`47`	`configDefaults,`
`48`		`- options,`
`49`	`48`	`removeUndefinedValues(viteConfig.test ?? {}),`
	`49`	`+ options,`
`50`	`50`	`)`
`51`	`51`	`testConfig.api = resolveApiServerConfig(testConfig)`
`52`	`52`