From 0804197bdabe607ab33950b625150f7d44de6397 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Thu, 4 Dec 2025 09:48:47 +0900
Subject: [PATCH] fix

---
 .devcontainer/devcontainer.json                      |  1 -
 package.json                                         |  4 ++--
 .../src/server/api/endpoints/notes/create.test.ts    |  2 +-
 packages/backend/test-federation/compose.yml         | 12 ++----------
 .../backend/test/unit/ChannelFollowingService.ts     |  2 +-
 packages/backend/test/unit/ChannelMutingService.ts   |  2 +-
 6 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index e800743469..bacad34f70 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -19,7 +19,6 @@
 				"editorconfig.editorconfig",
 				"dbaeumer.vscode-eslint",
 				"Vue.volar",
-				"Orta.vscode-jest",
 				"dbaeumer.vscode-eslint",
 				"mrmlnc.vscode-json5"
 			]
diff --git a/package.json b/package.json
index e72bb70d5f..2f75525f91 100644
--- a/package.json
+++ b/package.json
@@ -44,8 +44,8 @@
 		"cy:run": "pnpm cypress run",
 		"e2e": "pnpm start-server-and-test start:test http://localhost:61812 cy:run",
 		"e2e-dev-container": "ncp ./.config/cypress-devcontainer.yml ./.config/test.yml && pnpm start-server-and-test start:test http://localhost:61812 cy:run",
-		"jest": "cd packages/backend && pnpm jest",
-		"jest-and-coverage": "cd packages/backend && pnpm jest-and-coverage",
+		"backend-unit-test": "cd packages/backend && pnpm test",
+		"backend-unit-test-and-coverage": "cd packages/backend && pnpm test-and-coverage",
 		"test": "pnpm -r test",
 		"test-and-coverage": "pnpm -r test-and-coverage",
 		"clean": "node ./scripts/clean.js",
diff --git a/packages/backend/src/server/api/endpoints/notes/create.test.ts b/packages/backend/src/server/api/endpoints/notes/create.test.ts
index 6097f9c562..629214382b 100644
--- a/packages/backend/src/server/api/endpoints/notes/create.test.ts
+++ b/packages/backend/src/server/api/endpoints/notes/create.test.ts
@@ -8,7 +8,7 @@ process.env.NODE_ENV = 'test';
 import { readFile } from 'node:fs/promises';
 import { fileURLToPath } from 'node:url';
 import { dirname } from 'node:path';
-import { describe, test, expect } from '@jest/globals';
+import { describe, test, expect } from 'vitest';
 import { getValidator } from '../../../../../test/prelude/get-api-validator.js';
 import { paramDef } from './create.js';
 
diff --git a/packages/backend/test-federation/compose.yml b/packages/backend/test-federation/compose.yml
index 07c0e03f99..6851256533 100644
--- a/packages/backend/test-federation/compose.yml
+++ b/packages/backend/test-federation/compose.yml
@@ -43,16 +43,8 @@ services:
         target: /misskey/packages/backend/test-federation/test
         read_only: true
       - type: bind
-        source: ../jest.config.cjs
-        target: /misskey/packages/backend/jest.config.cjs
-        read_only: true
-      - type: bind
-        source: ../jest.config.fed.cjs
-        target: /misskey/packages/backend/jest.config.fed.cjs
-        read_only: true
-      - type: bind
-        source: ../jest.js
-        target: /misskey/packages/backend/jest.js
+        source: ../vitest.config.ts
+        target: /misskey/packages/backend/vitest.config.ts
         read_only: true
       - type: bind
         source: ../scripts/convert_config.js
diff --git a/packages/backend/test/unit/ChannelFollowingService.ts b/packages/backend/test/unit/ChannelFollowingService.ts
index 2d3196f2f4..3b1ad72287 100644
--- a/packages/backend/test/unit/ChannelFollowingService.ts
+++ b/packages/backend/test/unit/ChannelFollowingService.ts
@@ -5,7 +5,7 @@
 
 /* eslint-disable */
 
-import { afterEach, beforeEach, describe, expect } from '@jest/globals';
+import { afterEach, beforeEach, describe, expect, beforeAll, afterAll, test } from 'vitest';
 import { Test, TestingModule } from '@nestjs/testing';
 import { GlobalModule } from '@/GlobalModule.js';
 import { CoreModule } from '@/core/CoreModule.js';
diff --git a/packages/backend/test/unit/ChannelMutingService.ts b/packages/backend/test/unit/ChannelMutingService.ts
index 6916701d1f..0c59f141a4 100644
--- a/packages/backend/test/unit/ChannelMutingService.ts
+++ b/packages/backend/test/unit/ChannelMutingService.ts
@@ -5,7 +5,7 @@
 
 /* eslint-disable */
 
-import { afterEach, beforeEach, describe, expect } from '@jest/globals';
+import { afterEach, beforeEach, describe, expect, beforeAll, afterAll, test } from 'vitest';
 import { Test, TestingModule } from '@nestjs/testing';
 import { GlobalModule } from '@/GlobalModule.js';
 import { CoreModule } from '@/core/CoreModule.js';