fix: vitest

dev-banane · dev-banane · commit 2fedff459ce0 · 2026-04-10T00:04:54.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,11 +10,13 @@
     "build:server": "tsc --project server/tsconfig.json",
     "build:dev": "vp build --mode development",
     "build-only": "vp build",
-    "test": "vp test run",
+    "test": "vitest run",
+    "test:watch": "vitest",
     "lint": "eslint .",
     "format:check": "prettier --check .",
     "format": "prettier --write .",
-    "type-check": "tsc --noEmit"
+    "type-check": "tsc --noEmit",
+    "postinstall": "node scripts/verify-node-modules.mjs"
   },
   "dependencies": {
     "@socket.io/redis-adapter": "^8.3.0",
@@ -58,7 +60,8 @@
     "react-floater": {
       "react": "$react",
       "react-dom": "$react-dom"
-    }
+    },
+    "@jridgewell/sourcemap-codec": "1.5.5"
   },
   "devDependencies": {
     "@eslint/js": "^9.36.0",
@@ -71,7 +74,6 @@
     "@types/pg": "^8.15.5",
     "@types/react": "^19.1.13",
     "@types/react-dom": "^19.1.9",
-    "@types/supertest": "^7.2.0",
     "@types/ws": "^8.18.1",
     "@vitejs/plugin-react": "^6.0.1",
     "cross-env": "^10.1.0",
@@ -81,12 +83,12 @@
     "globals": "^16.4.0",
     "nodemon": "^3.1.10",
     "prettier": "^3.6.2",
-    "supertest": "^7.2.2",
     "ts-node": "^10.9.2",
     "tsx": "^4.20.6",
     "typescript": "~5.8.3",
     "typescript-eslint": "^8.44.0",
     "vite": "^8.0.8",
-    "vite-plus": "^0.1.16"
+    "vite-plus": "^0.1.16",
+    "vitest": "3.2.4"
   }
-}
+}
diff --git a/tests/server/db/admin.test.ts b/tests/server/db/admin.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   redis: {
diff --git a/tests/server/db/apiLogs.test.ts b/tests/server/db/apiLogs.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   executeTakeFirst: vi.fn(),
diff --git a/tests/server/db/audit.test.ts b/tests/server/db/audit.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   executeTakeFirst: vi.fn(),
diff --git a/tests/server/db/ban.test.ts b/tests/server/db/ban.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   insertExecute: vi.fn(),
diff --git a/tests/server/db/chats.test.ts b/tests/server/db/chats.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   execute: vi.fn(),
diff --git a/tests/server/db/feedback.test.ts b/tests/server/db/feedback.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   execute: vi.fn(),
diff --git a/tests/server/db/flightLogs.test.ts b/tests/server/db/flightLogs.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   executeTakeFirst: vi.fn(),
diff --git a/tests/server/db/flights.test.ts b/tests/server/db/flights.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   executeTakeFirst: vi.fn(),
diff --git a/tests/server/db/leaderboard.test.ts b/tests/server/db/leaderboard.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   execute: vi.fn(),
diff --git a/tests/server/db/notifications.test.ts b/tests/server/db/notifications.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   execute: vi.fn(),
diff --git a/tests/server/db/ratings.test.ts b/tests/server/db/ratings.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   execute: vi.fn(),
diff --git a/tests/server/db/roles.test.ts b/tests/server/db/roles.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   execute: vi.fn(),
diff --git a/tests/server/db/sessions.test.ts b/tests/server/db/sessions.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   executeTakeFirst: vi.fn(),
diff --git a/tests/server/db/statistics.test.ts b/tests/server/db/statistics.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   execute: vi.fn(),
diff --git a/tests/server/db/testers.test.ts b/tests/server/db/testers.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   execute: vi.fn(),
diff --git a/tests/server/db/updateModals.test.ts b/tests/server/db/updateModals.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   execute: vi.fn(),
diff --git a/tests/server/db/userNotifications.test.ts b/tests/server/db/userNotifications.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   execute: vi.fn(),
diff --git a/tests/server/db/users.test.ts b/tests/server/db/users.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   redisDel: vi.fn(),
diff --git a/tests/server/db/version.test.ts b/tests/server/db/version.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const mocks = vi.hoisted(() => ({
   executeTakeFirst: vi.fn(),
diff --git a/tests/server/helpers/appRequest.ts b/tests/server/helpers/appRequest.ts
@@ -0,0 +1,69 @@
+import http from 'node:http';
+import type { Application } from 'express';
+
+export type AppHttpResult = { status: number; body: unknown };
+
+/**
+ * HTTP-level assertions without supertest/superagent (avoids broken nested deps like asynckit on Windows).
+ * Uses `http.request` (not `fetch`) so tests can mock `globalThis.fetch` for route handlers without breaking the client call.
+ */
+export async function appRequest(
+  app: Application,
+  method: 'GET' | 'POST',
+  path: string,
+  jsonBody?: unknown
+): Promise<AppHttpResult> {
+  return await new Promise((resolve, reject) => {
+    const server = http.createServer(app);
+    server.once('error', reject);
+    server.listen(0, '127.0.0.1', () => {
+      const addr = server.address();
+      if (addr === null || typeof addr === 'string') {
+        server.close();
+        reject(new Error('invalid server address'));
+        return;
+      }
+      const port = addr.port;
+      const hasBody = method === 'POST' && jsonBody !== undefined;
+      const bodyStr = hasBody ? JSON.stringify(jsonBody) : undefined;
+      const opts: http.RequestOptions = {
+        hostname: '127.0.0.1',
+        port,
+        path,
+        method,
+        headers: hasBody
+          ? {
+              'Content-Type': 'application/json',
+              'Content-Length': Buffer.byteLength(bodyStr!, 'utf8'),
+            }
+          : undefined,
+      };
+
+      const req = http.request(opts, (res) => {
+        const chunks: Buffer[] = [];
+        res.on('data', (c) => chunks.push(c));
+        res.on('end', () => {
+          const text = Buffer.concat(chunks).toString('utf8');
+          let body: unknown;
+          if (!text) {
+            body = null;
+          } else {
+            try {
+              body = JSON.parse(text) as unknown;
+            } catch {
+              body = text;
+            }
+          }
+          resolve({ status: res.statusCode ?? 0, body });
+          server.close();
+        });
+      });
+      req.on('error', (err) => {
+        server.close();
+        reject(err);
+      });
+      if (bodyStr) req.write(bodyStr);
+      req.end();
+    });
+  });
+}
diff --git a/tests/server/routes/data.route.test.ts b/tests/server/routes/data.route.test.ts
@@ -1,6 +1,7 @@
 import express from 'express';
-import request from 'supertest';
-import { describe, expect, it, vi } from 'vite-plus/test';
+import { describe, expect, it, vi } from 'vitest';
+
+import { appRequest } from '../helpers/appRequest.js';
 
 vi.mock('../../../server/db/connection.js', () => ({
   mainDb: {},
@@ -17,7 +18,7 @@ describe('GET /api/data/airports', () => {
   app.use('/', dataRouter);
 
   it('returns airport json when data files exist', async () => {
-    const res = await request(app).get('/airports');
+    const res = await appRequest(app, 'GET', '/airports');
 
     expect(res.status).toBe(200);
     expect(Array.isArray(res.body)).toBe(true);
diff --git a/tests/server/routes/feedback.route.test.ts b/tests/server/routes/feedback.route.test.ts
@@ -1,6 +1,7 @@
 import express from 'express';
-import request from 'supertest';
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { appRequest } from '../helpers/appRequest.js';
 
 vi.mock('../../../server/middleware/auth.js', () => ({
   __esModule: true,
@@ -38,13 +39,16 @@ describe('POST /api/feedback', () => {
   });
 
   it('returns 400 when rating is out of range', async () => {
-    const res = await request(app).post('/').send({ rating: 10 });
+    const res = await appRequest(app, 'POST', '/', { rating: 10 });
 
     expect(res.status).toBe(400);
   });
 
   it('creates feedback when valid', async () => {
-    const res = await request(app).post('/').send({ rating: 5, comment: ' ok ' });
+    const res = await appRequest(app, 'POST', '/', {
+      rating: 5,
+      comment: ' ok ',
+    });
 
     expect(res.status).toBe(200);
     expect(addFeedback).toHaveBeenCalled();
diff --git a/tests/server/routes/metar.route.test.ts b/tests/server/routes/metar.route.test.ts
@@ -1,6 +1,7 @@
 import express from 'express';
-import request from 'supertest';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { appRequest } from '../helpers/appRequest.js';
 
 import metarRouter from '../../../server/routes/metar.js';
 
@@ -23,9 +24,9 @@ describe('GET /api/metar/:icao', () => {
   });
 
   it('returns first METAR object when upstream returns json array', async () => {
-    const res = await request(app).get('/EGLL');
+    const res = await appRequest(app, 'GET', '/EGLL');
 
     expect(res.status).toBe(200);
-    expect(res.body.raw).toContain('EGLL');
+    expect((res.body as { raw: string }).raw).toContain('EGLL');
   });
 });
diff --git a/tests/server/routes/pilot.route.test.ts b/tests/server/routes/pilot.route.test.ts
@@ -1,6 +1,7 @@
 import express from 'express';
-import request from 'supertest';
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { appRequest } from '../helpers/appRequest.js';
 
 vi.mock('../../../server/db/users.js', () => ({
   getUserByUsername: vi.fn(),
@@ -41,7 +42,7 @@ describe('GET /api/pilot/:username', () => {
   it('returns 404 when user is unknown', async () => {
     vi.mocked(getUserByUsername).mockResolvedValue(null);
 
-    const res = await request(app).get('/nobody');
+    const res = await appRequest(app, 'GET', '/nobody');
 
     expect(res.status).toBe(404);
   });
@@ -74,9 +75,11 @@ describe('GET /api/pilot/:username', () => {
       ratingCount: 0,
     });
 
-    const res = await request(app).get('/pilot');
+    const res = await appRequest(app, 'GET', '/pilot');
 
     expect(res.status).toBe(200);
-    expect(res.body.user.username).toBe('pilot');
+    expect((res.body as { user: { username: string } }).user.username).toBe(
+      'pilot'
+    );
   });
 });
diff --git a/tests/server/routes/ratings.route.test.ts b/tests/server/routes/ratings.route.test.ts
@@ -1,6 +1,7 @@
 import express from 'express';
-import request from 'supertest';
-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { appRequest } from '../helpers/appRequest.js';
 
 vi.mock('../../../server/middleware/auth.js', () => ({
   __esModule: true,
@@ -38,26 +39,29 @@ describe('POST /api/ratings', () => {
   });
 
   it('returns 400 when controllerId is missing', async () => {
-    const res = await request(app).post('/').send({ rating: 5 });
+    const res = await appRequest(app, 'POST', '/', { rating: 5 });
 
     expect(res.status).toBe(400);
   });
 
   it('returns 400 when rating self', async () => {
-    const res = await request(app)
-      .post('/')
-      .send({ controllerId: 'pilot1', rating: 5 });
+    const res = await appRequest(app, 'POST', '/', {
+      controllerId: 'pilot1',
+      rating: 5,
+    });
 
     expect(res.status).toBe(400);
   });
 
   it('submits rating when valid', async () => {
-    const res = await request(app)
-      .post('/')
-      .send({ controllerId: 'ctrl1', rating: 4, flightId: 'f1' });
+    const res = await appRequest(app, 'POST', '/', {
+      controllerId: 'ctrl1',
+      rating: 4,
+      flightId: 'f1',
+    });
 
     expect(res.status).toBe(200);
-    expect(res.body.success).toBe(true);
+    expect((res.body as { success: boolean }).success).toBe(true);
     expect(addControllerRating).toHaveBeenCalledWith(
       'ctrl1',
       'pilot1',
diff --git a/tests/server/routes/sessions.route.test.ts b/tests/server/routes/sessions.route.test.ts
diff --git a/tests/server/routes/updateModal.route.test.ts b/tests/server/routes/updateModal.route.test.ts
diff --git a/tests/server/routes/version.route.test.ts b/tests/server/routes/version.route.test.ts
diff --git a/tests/server/utils/findRoute.test.ts b/tests/server/utils/findRoute.test.ts
diff --git a/tests/server/utils/validation.test.ts b/tests/server/utils/validation.test.ts
diff --git a/tests/setup/vitestSetup.ts b/tests/setup/vitestSetup.ts
diff --git a/vite.config.ts b/vite.config.ts
diff --git a/vitest.config.ts b/vitest.config.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { beforeEach, describe, expect, it, vi } from 'vite-plus/test';`
	`1`	`+import { beforeEach, describe, expect, it, vi } from 'vitest';`
`2`	`2`
`3`	`3`	`const mocks = vi.hoisted(() => ({`
`4`	`4`	`redis: {`