From 43b2d04e2cd550089cd69623ed52f0f13be1e535 Mon Sep 17 00:00:00 2001 From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com> Date: Fri, 12 Jun 2026 17:54:42 +0200 Subject: [PATCH] fix: version tests (#29032) --- e2e/src/specs/server/api/server.e2e-spec.ts | 2 +- server/src/services/version.service.spec.ts | 25 ++++++++------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/e2e/src/specs/server/api/server.e2e-spec.ts b/e2e/src/specs/server/api/server.e2e-spec.ts index 902c5302e5..46d998511d 100644 --- a/e2e/src/specs/server/api/server.e2e-spec.ts +++ b/e2e/src/specs/server/api/server.e2e-spec.ts @@ -95,7 +95,7 @@ describe('/server', () => { major: expect.any(Number), minor: expect.any(Number), patch: expect.any(Number), - prerelease: null, + prerelease: expect.anything(), }); }); }); diff --git a/server/src/services/version.service.spec.ts b/server/src/services/version.service.spec.ts index d73edb9850..0044730cee 100644 --- a/server/src/services/version.service.spec.ts +++ b/server/src/services/version.service.spec.ts @@ -1,7 +1,6 @@ import { DateTime } from 'luxon'; import { SemVer } from 'semver'; import { defaults } from 'src/config'; -import { serverVersion } from 'src/constants'; import { ReleaseChannel } from 'src/dtos/system-config.dto'; import { CronJob, JobName, JobStatus, SystemMetadataKey } from 'src/enum'; import { VersionService } from 'src/services/version.service'; @@ -23,16 +22,10 @@ describe(VersionService.name, () => { mocks.cron.update.mockResolvedValue(); }); - beforeAll(() => { - vitest.mock(import('src/constants.js'), async () => ({ - ...(await vitest.importActual('src/constants.js')), - serverVersion: new SemVer('v3.0.0'), - })); - }); - - afterAll(() => { - vitest.unmock(import('src/constants.js')); - }); + vitest.mock(import('src/constants.js'), async (importOriginal) => ({ + ...(await importOriginal()), + serverVersion: new SemVer('v3.0.0'), + })); it('should work', () => { expect(sut).toBeDefined(); @@ -53,7 +46,7 @@ describe(VersionService.name, () => { mocks.versionHistory.getLatest.mockResolvedValue({ id: 'version-1', createdAt: new Date(), - version: serverVersion.toString(), + version: '3.0.0', }); await expect(sut.onBootstrap()).resolves.toBeUndefined(); expect(mocks.versionHistory.create).not.toHaveBeenCalled(); @@ -64,7 +57,7 @@ describe(VersionService.name, () => { mocks.versionHistory.getLatest.mockResolvedValue({ id: 'version-1', createdAt: new Date(), - version: serverVersion.toString(), + version: '3.0.0', }); await sut.onBootstrap(); expect(mocks.cron.create).toHaveBeenCalledWith( @@ -121,7 +114,7 @@ describe(VersionService.name, () => { checkedAt: DateTime.utc().minus({ seconds: 60 }).toISO(), releaseVersion: '1.0.0', }); - mocks.serverInfo.getLatestRelease.mockResolvedValue(mockVersionResponse(serverVersion.toString())); + mocks.serverInfo.getLatestRelease.mockResolvedValue(mockVersionResponse('v3.0.0')); await expect(sut.handleVersionCheck()).resolves.toEqual(JobStatus.Success); expect(mocks.serverInfo.getLatestRelease).toHaveBeenCalled(); }); @@ -135,11 +128,11 @@ describe(VersionService.name, () => { }); it('should not notify if the version is equal', async () => { - mocks.serverInfo.getLatestRelease.mockResolvedValue(mockVersionResponse(serverVersion.toString())); + mocks.serverInfo.getLatestRelease.mockResolvedValue(mockVersionResponse('v3.0.0')); await expect(sut.handleVersionCheck()).resolves.toEqual(JobStatus.Success); expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.VersionCheckState, { checkedAt: expect.any(String), - releaseVersion: serverVersion.toString(), + releaseVersion: 'v3.0.0', }); expect(mocks.websocket.clientBroadcast).not.toHaveBeenCalled(); });