abstract express test server initialization into a reusable utility function

Author: Antigravity Assistant

server/test/integration/socket-admin-override.test.ts

@@ -1,7 +1,6 @@
 import { describe, it, expect, beforeAll, afterAll, beforeEach, vi } from 'vitest';
 import { Server as HTTPServer } from 'http';
 import { Server } from 'socket.io';
-import express from 'express';
 import { createServer } from 'http';
 import { CONFIG } from '../../src/config.js';
 import { LobbyController } from '../../src/controllers/lobby.controller.js';
@@ -16,9 +15,9 @@ import {
   adminUser,
   teardownTestServer,
   setupTestMocks,
-  setupTestLobby
+  setupTestLobby,
+  createExpressTestServer
 } from './utils/socket-test-utils.js';
-import { setupSocket } from '../../src/sockets/index.js';
 
 vi.mock('../../src/models/Lobby.js', () => ({
   Lobby: {
@@ -37,31 +36,13 @@ describe('Admin Override Authority Integration', () => {
   beforeAll(async () => {
     setupTestMocks();
 
-    const app = express();
-    app.use(express.json());
-
-    httpServer = createServer(app);
-    io = new Server(httpServer);
-    setupSocket(io);
-
-    app.use((req, res, next) => {
-      (req as any).io = io;
-      (req as any).user = adminUser;
-      next();
-    });
+    const setup = await createExpressTestServer(adminUser);
+    io = setup.io;
+    httpServer = setup.httpServer;
+    port = setup.port;
+    const app = setup.app;
 
     app.post('/api/lobbies/:id/kick', requireLobbyOwner, LobbyController.kickUser);
-
-    await new Promise<void>((resolve, reject) => {
-      httpServer.listen(() => {
-        const address = httpServer.address();
-        if (!address || typeof address === 'string') {
-          return reject(new Error('Failed to gracefully acquire a port number for the test server.'));
-        }
-        port = address.port;
-        resolve();
-      });
-    });
   });
 
   beforeEach(() => {

server/test/integration/socket-ban.test.ts

@@ -1,7 +1,6 @@
 import { describe, it, expect, beforeAll, afterAll, beforeEach, vi } from 'vitest';
 import { Server as HTTPServer } from 'http';
 import { Server } from 'socket.io';
-import express from 'express';
 import { createServer } from 'http';
 import { CONFIG } from '../../src/config.js';
 import { LobbyController } from '../../src/controllers/lobby.controller.js';
@@ -17,9 +16,9 @@ import {
   userA,
   teardownTestServer,
   setupTestMocks,
-  setupTestLobby
+  setupTestLobby,
+  createExpressTestServer
 } from './utils/socket-test-utils.js';
-import { setupSocket } from '../../src/sockets/index.js';
 
 // 1. Mock the specific MongoDB call in User model using `vi.mock`
 vi.mock('../../src/models/User.js', () => ({
@@ -71,32 +70,13 @@ describe('Ban User Flow & Persistence Integration', () => {
       }
     });
 
-    const app = express();
-    app.use(express.json());
-
-    httpServer = createServer(app);
-    io = new Server(httpServer);
-    setupSocket(io);
-
-    // Attach IO and pretend we are UserA (Owner)
-    app.use((req, res, next) => {
-      (req as any).io = io;
-      (req as any).user = userA;
-      next();
-    });
+    const setup = await createExpressTestServer(userA);
+    io = setup.io;
+    httpServer = setup.httpServer;
+    port = setup.port;
+    const app = setup.app;
 
     app.post('/api/lobbies/:id/ban', LobbyController.banUser);
-
-    await new Promise<void>((resolve, reject) => {
-      httpServer.listen(() => {
-        const address = httpServer.address();
-        if (!address || typeof address === 'string') {
-          return reject(new Error('Failed to gracefully acquire a port number for the test server.'));
-        }
-        port = address.port;
-        resolve();
-      });
-    });
   });
 
   beforeEach(() => {

server/test/integration/socket-kick.test.ts

@@ -1,7 +1,6 @@
 import { describe, it, expect, beforeAll, afterAll, beforeEach } from 'vitest';
 import { Server as HTTPServer } from 'http';
 import { Server } from 'socket.io';
-import express from 'express';
 import { createServer } from 'http';
 import { CONFIG } from '../../src/config.js';
 import { LobbyController } from '../../src/controllers/lobby.controller.js';
@@ -15,9 +14,9 @@ import {
   userA,
   teardownTestServer,
   setupTestMocks,
-  setupTestLobby
+  setupTestLobby,
+  createExpressTestServer
 } from './utils/socket-test-utils.js';
-import { setupSocket } from '../../src/sockets/index.js';
 
 describe('Kick User Flow Integration', () => {
   let io: Server;
@@ -27,32 +26,13 @@ describe('Kick User Flow Integration', () => {
   beforeAll(async () => {
     setupTestMocks();
 
-    const app = express();
-    app.use(express.json());
-
-    httpServer = createServer(app);
-    io = new Server(httpServer);
-    setupSocket(io);
-
-    // Attach IO and mock owner auth so that we bypass requireLobbyOwner and authenticateToken issues
-    app.use((req, res, next) => {
-      (req as any).io = io;
-      (req as any).user = userA; // owner
-      next();
-    });
+    const setup = await createExpressTestServer(userA); // owner
+    io = setup.io;
+    httpServer = setup.httpServer;
+    port = setup.port;
+    const app = setup.app;
 
     app.post('/api/lobbies/:id/kick', LobbyController.kickUser);
-
-    await new Promise<void>((resolve, reject) => {
-      httpServer.listen(() => {
-        const address = httpServer.address();
-        if (!address || typeof address === 'string') {
-          return reject(new Error('Failed to gracefully acquire a port number for the test server.'));
-        }
-        port = address.port;
-        resolve();
-      });
-    });
   });
 
   beforeEach(() => {

server/test/integration/utils/socket-test-utils.ts

@@ -1,3 +1,4 @@
+import express from 'express';
 import { createServer, Server as HTTPServer } from 'http';
 import { Server } from 'socket.io';
 import { io as Client, Socket as ClientSocket } from 'socket.io-client';
@@ -72,6 +73,31 @@ export const createTestServer = (): Promise<{ io: Server; httpServer: HTTPServer
   });
 };
 
+export const createExpressTestServer = (mockUser: any): Promise<{ io: Server; httpServer: HTTPServer; port: number; app: express.Express }> => {
+  const app = express();
+  app.use(express.json());
+
+  const httpServer = createServer(app);
+  const io = new Server(httpServer);
+  setupSocket(io);
+
+  app.use((req, res, next) => {
+    (req as any).io = io;
+    (req as any).user = mockUser;
+    next();
+  });
+
+  return new Promise((resolve, reject) => {
+    httpServer.listen(() => {
+      const address = httpServer.address();
+      if (!address || typeof address === 'string') {
+        return reject(new Error('Failed to gracefully acquire a port number for the test server.'));
+      }
+      resolve({ io, httpServer, port: address.port, app });
+    });
+  });
+};
+
 export const bootstrapTestServer = async (withMocks = true) => {
   if (withMocks) setupTestMocks();
   return await createTestServer();