From c306cdbdd93eba487b3434a88f1c8d771e1b8180 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 13 Jun 2025 21:44:53 +0900
Subject: [PATCH] attempt to fix test

---
 packages/backend/jest.config.cjs        |  6 ++----
 packages/backend/jest.config.e2e.cjs    |  2 +-
 packages/backend/package.json           |  1 +
 packages/backend/test/jest.setup.e2e.ts | 11 +++++++++++
 packages/backend/test/jest.setup.ts     |  9 ++++-----
 pnpm-lock.yaml                          |  3 +++
 6 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 packages/backend/test/jest.setup.e2e.ts

diff --git a/packages/backend/jest.config.cjs b/packages/backend/jest.config.cjs
index c87a107c23..0bb6d03987 100644
--- a/packages/backend/jest.config.cjs
+++ b/packages/backend/jest.config.cjs
@@ -136,7 +136,7 @@ module.exports = {
 	// runner: "jest-runner",
 
 	// The paths to modules that run some code to configure or set up the testing environment before each test
-	// setupFiles: [],
+	setupFiles: ["<rootDir>/test/jest.setup.ts"],
 
 	// A list of paths to modules that run some code to configure or set up the testing framework before each test
 	// setupFilesAfterEnv: [],
@@ -151,9 +151,7 @@ module.exports = {
 	testEnvironment: "node",
 
 	// Options that will be passed to the testEnvironment
-	testEnvironmentOptions: {
-		globalsCleanup: 'soft', // Soft cleanup mode to avoid issues with global variables in tests
-	},
+	// testEnvironmentOptions: {},
 
 	// Adds a location field to test results
 	// testLocationInResults: false,
diff --git a/packages/backend/jest.config.e2e.cjs b/packages/backend/jest.config.e2e.cjs
index 4502da47df..f984890e19 100644
--- a/packages/backend/jest.config.e2e.cjs
+++ b/packages/backend/jest.config.e2e.cjs
@@ -8,7 +8,7 @@ const base = require('./jest.config.cjs')
 module.exports = {
 	...base,
 	globalSetup: "<rootDir>/built-test/entry.js",
-	setupFilesAfterEnv: ["<rootDir>/test/jest.setup.ts"],
+	setupFilesAfterEnv: ["<rootDir>/test/jest.setup.e2e.ts"],
 	testMatch: [
 		"<rootDir>/test/e2e/**/*.ts",
 	],
diff --git a/packages/backend/package.json b/packages/backend/package.json
index d98f34cd3e..12faa58421 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -236,6 +236,7 @@
 		"fkill": "9.0.0",
 		"jest": "30.0.0",
 		"jest-mock": "30.0.0",
+		"jest-util": "30.0.0",
 		"nodemon": "3.1.10",
 		"pid-port": "1.0.2",
 		"simple-oauth2": "5.1.0",
diff --git a/packages/backend/test/jest.setup.e2e.ts b/packages/backend/test/jest.setup.e2e.ts
new file mode 100644
index 0000000000..9bde512026
--- /dev/null
+++ b/packages/backend/test/jest.setup.e2e.ts
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { initTestDb, sendEnvResetRequest } from './utils.js';
+
+beforeAll(async () => {
+	await initTestDb(false);
+	await sendEnvResetRequest();
+});
diff --git a/packages/backend/test/jest.setup.ts b/packages/backend/test/jest.setup.ts
index 7c6dd6a55f..25fd674069 100644
--- a/packages/backend/test/jest.setup.ts
+++ b/packages/backend/test/jest.setup.ts
@@ -3,9 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { initTestDb, sendEnvResetRequest } from './utils.js';
+import { protectProperties } from 'jest-util';
 
-beforeAll(async () => {
-		await initTestDb(false);
-		await sendEnvResetRequest();
-});
+protectProperties(globalThis.ReadableStreamDefaultReader);
+protectProperties(globalThis.ReadableStreamBYOBReader);
+protectProperties(globalThis.WritableStreamDefaultWriter);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 55bfb383ba..ebd2d90698 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -589,6 +589,9 @@ importers:
       jest-mock:
         specifier: 30.0.0
         version: 30.0.0
+      jest-util:
+        specifier: 30.0.0
+        version: 30.0.0
       nodemon:
         specifier: 3.1.10
         version: 3.1.10