From ae07a4aae61a857f0bef5ad68347c04f8deb6da2 Mon Sep 17 00:00:00 2001 From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Thu, 4 Dec 2025 10:05:17 +0900 Subject: [PATCH] fix --- packages/backend/test/{setup.ts => setup.e2e.ts} | 1 - .../backend/test/{jest.setup.unit.cjs => setup.unit.ts} | 6 ++++-- packages/backend/vitest.config.e2e.ts | 2 +- packages/backend/vitest.config.ts | 6 ++++++ packages/backend/vitest.config.unit.ts | 1 + 5 files changed, 12 insertions(+), 4 deletions(-) rename packages/backend/test/{setup.ts => setup.e2e.ts} (99%) rename packages/backend/test/{jest.setup.unit.cjs => setup.unit.ts} (79%) diff --git a/packages/backend/test/setup.ts b/packages/backend/test/setup.e2e.ts similarity index 99% rename from packages/backend/test/setup.ts rename to packages/backend/test/setup.e2e.ts index 0cb098898f..3141dc15ad 100644 --- a/packages/backend/test/setup.ts +++ b/packages/backend/test/setup.e2e.ts @@ -10,4 +10,3 @@ beforeAll(async () => { await initTestDb(false); await sendEnvResetRequest(); }); - diff --git a/packages/backend/test/jest.setup.unit.cjs b/packages/backend/test/setup.unit.ts similarity index 79% rename from packages/backend/test/jest.setup.unit.cjs rename to packages/backend/test/setup.unit.ts index dd879c81c8..b2c9ba0adb 100644 --- a/packages/backend/test/jest.setup.unit.cjs +++ b/packages/backend/test/setup.unit.ts @@ -3,8 +3,10 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -module.exports = async () => { +import { beforeAll } from 'vitest'; + +beforeAll(() => { // DBはUTC(っぽい)ので、テスト側も合わせておく process.env.TZ = 'UTC'; process.env.NODE_ENV = 'test'; -}; +}); diff --git a/packages/backend/vitest.config.e2e.ts b/packages/backend/vitest.config.e2e.ts index ca054ebd27..6ed0e81ac4 100644 --- a/packages/backend/vitest.config.e2e.ts +++ b/packages/backend/vitest.config.e2e.ts @@ -7,7 +7,7 @@ export default mergeConfig( test: { include: ['test/e2e/**/*.ts'], globalSetup: './built-test/entry.js', - setupFiles: ['./test/setup.ts'], + setupFiles: ['./test/setup.e2e.ts'], }, }), ); diff --git a/packages/backend/vitest.config.ts b/packages/backend/vitest.config.ts index 49d7ec5574..933847939a 100644 --- a/packages/backend/vitest.config.ts +++ b/packages/backend/vitest.config.ts @@ -14,6 +14,12 @@ export const baseConfig = defineConfig({ include: ['src/**/*.ts'], exclude: ['src/**/*.test.ts'], }, + restoreMocks: true, + testTimeout: 60000, + maxWorkers: 1, + logHeapUsage: true, + vmMemoryLimit: 1024, + maxConcurrency: 32, }, resolve: { alias: { diff --git a/packages/backend/vitest.config.unit.ts b/packages/backend/vitest.config.unit.ts index e02324800e..8f341fdc09 100644 --- a/packages/backend/vitest.config.unit.ts +++ b/packages/backend/vitest.config.unit.ts @@ -5,6 +5,7 @@ export default mergeConfig( baseConfig, defineConfig({ test: { + globalSetup: './test/setup.unit.ts', include: ['test/unit/**/*.ts', 'src/**/*.test.ts'], }, }),