Merge pull request #1564 from finos/vitest-4-bump-and-test-fixes

chore(deps): bump vitest to v4 and fix tests

Author: fabiovincenzi

package-lock.json

@@ -182,7 +182,7 @@
     "@types/validator": "^13.15.10",
     "@types/yargs": "^17.0.35",
     "@vitejs/plugin-react": "^6.0.2",
-    "@vitest/coverage-v8": "^3.2.7",
+    "@vitest/coverage-v8": "^4.1.8",
     "c8": "^11.0.0",
     "cross-env": "^10.1.0",
     "cypress": "^15.18.1",
@@ -206,7 +206,7 @@
     "typescript-eslint": "^8.61.1",
     "vite": "^8.0.14",
     "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^3.2.7"
+    "vitest": "^4.1.8"
   },
   "overrides": {
     "rolldown": "1.0.1",

package.json

@@ -27,6 +27,7 @@
 import { describe, it, beforeAll, afterAll, beforeEach, afterEach, expect, vi } from 'vitest';
 import request from 'supertest';
 import { Service } from '../src/service';
+import * as config from '../src/config';
 import * as db from '../src/db';
 import { Proxy } from '../src/proxy';
 import { Express } from 'express';
@@ -45,6 +46,8 @@ describe('init', () => {
   // Runs before all tests
   beforeAll(async function () {
     // Starts the service and returns the express app
+    // Auto-assign free port (prevents EADDRINUSE errors when running tests in parallel)
+    vi.spyOn(config, 'getUIPort').mockReturnValue(0);
     const proxy = new Proxy();
     app = await Service.start(proxy);
   });
@@ -69,7 +72,7 @@ describe('init', () => {
   // Runs after all tests
   afterAll(function () {
     // Must close the server to avoid EADDRINUSE errors when running tests in parallel
-    Service.httpServer.close();
+    Service.httpServer?.close();
   });
 
   // Example test: check server is running

test/1.test.ts

@@ -555,6 +555,7 @@ describe('ConfigLoader', () => {
 
     it(
       'should throw error if repository is a valid URL but not a git repository',
+      { timeout: 30000 },
       async () => {
         const source: ConfigurationSource = {
           type: 'git',
@@ -579,11 +580,11 @@ describe('ConfigLoader', () => {
           /Failed to clone repository/,
         );
       },
-      { timeout: 30000 },
     );
 
     it(
       'should throw error if repository is a valid git repo but the branch does not exist',
+      { timeout: 30000 },
       async () => {
         const source: ConfigurationSource = {
           type: 'git',
@@ -597,44 +598,35 @@ describe('ConfigLoader', () => {
           /Failed to checkout branch/,
         );
       },
-      { timeout: 30000 },
     );
 
-    it(
-      'should throw error if config path was not found',
-      async () => {
-        const source: ConfigurationSource = {
-          type: 'git',
-          repository: 'https://github.com/finos/git-proxy.git',
-          path: 'path-not-found.json',
-          branch: 'main',
-          enabled: true,
-        };
+    it('should throw error if config path was not found', { timeout: 30000 }, async () => {
+      const source: ConfigurationSource = {
+        type: 'git',
+        repository: 'https://github.com/finos/git-proxy.git',
+        path: 'path-not-found.json',
+        branch: 'main',
+        enabled: true,
+      };
 
-        await expect(configLoader.loadFromSource(source)).rejects.toThrow(
-          /Configuration file not found at/,
-        );
-      },
-      { timeout: 30000 },
-    );
+      await expect(configLoader.loadFromSource(source)).rejects.toThrow(
+        /Configuration file not found at/,
+      );
+    });
 
-    it(
-      'should throw error if config file is not valid JSON',
-      async () => {
-        const source: ConfigurationSource = {
-          type: 'git',
-          repository: 'https://github.com/finos/git-proxy.git',
-          path: 'test/fixtures/baz.js',
-          branch: 'main',
-          enabled: true,
-        };
+    it('should throw error if config file is not valid JSON', { timeout: 30000 }, async () => {
+      const source: ConfigurationSource = {
+        type: 'git',
+        repository: 'https://github.com/finos/git-proxy.git',
+        path: 'test/fixtures/baz.js',
+        branch: 'main',
+        enabled: true,
+      };
 
-        await expect(configLoader.loadFromSource(source)).rejects.toThrow(
-          /Invalid configuration format in git/,
-        );
-      },
-      { timeout: 30000 },
-    );
+      await expect(configLoader.loadFromSource(source)).rejects.toThrow(
+        /Invalid configuration format in git/,
+      );
+    });
   });
 
   describe('deepMerge', () => {

test/ConfigLoader.test.ts

@@ -77,6 +77,10 @@ describe('proxy chain', function () {
     mockPushProcessors = initMockPushProcessors();
     mockPostProcessors = initMockPostProcessors();
 
+    // mockPreProcessors lives at module scope so needs manual reset
+    mockPreProcessors.parseAction.mockReset();
+    mockPreProcessors.parsePush.mockReset();
+
     // Mock the processors module
     vi.doMock('../src/proxy/processors', async () => ({
       pre: mockPreProcessors,

test/chain.test.ts

@@ -37,7 +37,9 @@ vi.mock('mongodb', async () => {
   const actual = await vi.importActual('mongodb');
   return {
     ...actual,
-    MongoClient: vi.fn(() => mockClient),
+    MongoClient: vi.fn(function () {
+      return mockClient;
+    }),
   };
 });