Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jescalada wants to merge 12 commits into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
00d2c1a
chore: bump vitest to 4.1.8, nyc to 18
jescalada Jun 6, 2026
ac1f7bb
fix: vitest mock errors and timeout arg ordering
jescalada Jun 6, 2026
c7a2f71
fix: auto-assign free ports when testing
jescalada Jun 6, 2026
8594e64
test: replace poolOptions with parallelism in vitest.config.ts
jescalada Jun 6, 2026
e20d77f
test: replace poolOptions with fileParallelism in vitest.config.integ…
jescalada Jun 6, 2026
0465c5d
fix: add gitAccount to AttestationBase
jescalada Jun 7, 2026
fa49f30
Merge branch 'main' into vitest-4-bump-and-test-fixes
jescalada Jun 7, 2026
96cbd3e
fix: missing package-lock.json entries
jescalada Jun 7, 2026
880ab1e
Merge branch 'main' into vitest-4-bump-and-test-fixes
jescalada Jul 13, 2026
f9dd5ec
test: fix failing new tests merged from main
jescalada Jul 13, 2026
b24d85e
Merge branch 'main' into vitest-4-bump-and-test-fixes
jescalada Jul 15, 2026
f4015dc
chore: run npm i
jescalada Jul 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,267 changes: 833 additions & 1,434 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react-html-parser": "^2.0.2",
"react-router-dom": "6.30.3",
"react-router-dom": "^6.30.4",
"simple-git": "^3.30.0",
"ssh2": "~1.17.0",
"uuid": "^14.0.0",
Expand Down Expand Up @@ -179,7 +179,7 @@
"@types/validator": "^13.15.10",
"@types/yargs": "^17.0.35",
"@vitejs/plugin-react": "^6.0.2",
"@vitest/coverage-v8": "^3.2.4",
"@vitest/coverage-v8": "^4.1.8",
"c8": "^11.0.0",
"cross-env": "^10.1.0",
"cypress": "^15.9.0",
Expand All @@ -192,7 +192,7 @@
"globals": "^17.6.0",
"husky": "^9.1.7",
"lint-staged": "^17.0.5",
"nyc": "^17.1.0",
"nyc": "^18.0.0",
"prettier": "^3.8.1",
"quicktype": "^23.2.6",
"supertest": "^7.2.2",
Expand All @@ -202,7 +202,7 @@
"typescript-eslint": "^8.54.0",
"vite": "^8.0.14",
"vite-tsconfig-paths": "^5.1.4",
"vitest": "^3.2.4"
"vitest": "^4.1.8"
},
"overrides": {
"rolldown": "1.0.1"
Expand Down
1 change: 1 addition & 0 deletions src/proxy/processors/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ type AttestationBase = {
reviewer: {
username: string;
email: string;
gitAccount?: string; // Legacy field for GitHub usernames

@kriswest kriswest Jul 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what prompted this coming back?

@jescalada jescalada Jul 13, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I added that again because of the following error on npm run check-types:

image

This is being used by the frontend to render legacy GitHub-only usernames:

<>
  {isGitHub && (
    <UserLink username={push.attestation.reviewer.username}>
      <img
        style={{ width: '45px', borderRadius: '20px' }}
        src={`https://github.com/${push.attestation.reviewer.gitAccount}.png`}
      />
    </UserLink>
  )}
  <div>
    <p>
      {isGitHub && (
        <UserLink username={push.attestation.reviewer.username}>
          {push.attestation.reviewer.gitAccount}
        </UserLink>
      )}
      {!isGitHub && <UserLink username={push.attestation.reviewer.username} />} approved
      this contribution
    </p>
  </div>
</>

This type error can still be viewed on main when running npm run check-types. The CI executes on the server-side only, hence why we didn't see this before: npm run check-types:server

};
timestamp: string | Date;
automated?: boolean;
Expand Down
5 changes: 4 additions & 1 deletion test/1.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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);
});
Expand All @@ -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
Expand Down
60 changes: 26 additions & 34 deletions test/ConfigLoader.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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', () => {
Expand Down
4 changes: 4 additions & 0 deletions test/chain.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,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,
Expand Down
4 changes: 3 additions & 1 deletion test/db/mongo/helper.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}),
};
});

Expand Down
Loading
Loading