From c71c059929a0a7ec7ec9f708d40ebde1d86d6154 Mon Sep 17 00:00:00 2001 From: Roomote Date: Sat, 8 Aug 2026 00:44:24 +0000 Subject: [PATCH] refactor: reuse shared CustomModesManager test helpers --- ...odesManager.exportImportSlugChange.spec.ts | 19 ++++++----------- .../__tests__/CustomModesManager.spec.ts | 19 ++++++----------- .../CustomModesManager.yamlEdgeCases.spec.ts | 21 +++++++------------ 3 files changed, 19 insertions(+), 40 deletions(-) diff --git a/src/core/config/__tests__/CustomModesManager.exportImportSlugChange.spec.ts b/src/core/config/__tests__/CustomModesManager.exportImportSlugChange.spec.ts index 3c9655ed08..b141006c85 100644 --- a/src/core/config/__tests__/CustomModesManager.exportImportSlugChange.spec.ts +++ b/src/core/config/__tests__/CustomModesManager.exportImportSlugChange.spec.ts @@ -13,6 +13,8 @@ import type { ModeConfig } from "@roo-code/types" import { fileExistsAtPath } from "../../../utils/fs" import { getWorkspacePath } from "../../../utils/path" import { GlobalFileNames } from "../../../shared/globalFileNames" +import { clearAllMocks } from "../../../test-utils/reset" +import { makeExtensionContext, makeUri } from "../../../test-utils/vscode" import { CustomModesManager } from "../CustomModesManager" @@ -53,20 +55,11 @@ describe("CustomModesManager - Export/Import with Slug Changes", () => { beforeEach(() => { mockOnUpdate = vi.fn() - mockContext = { - globalState: { - get: vi.fn(), - update: vi.fn(), - keys: vi.fn(() => []), - setKeysForSync: vi.fn(), - }, - globalStorageUri: { - fsPath: mockStoragePath, - }, - } as unknown as vscode.ExtensionContext + mockContext = makeExtensionContext({ globalStorageUri: makeUri(mockStoragePath) }) + mockContext.globalState.setKeysForSync = vi.fn() // mockWorkspacePath is now defined at the top level - mockWorkspaceFolders = [{ uri: { fsPath: mockWorkspacePath } }] + mockWorkspaceFolders = [{ uri: makeUri(mockWorkspacePath) }] ;(vscode.workspace as any).workspaceFolders = mockWorkspaceFolders ;(vscode.workspace.onDidSaveTextDocument as Mock).mockReturnValue({ dispose: vi.fn() }) ;(getWorkspacePath as Mock).mockReturnValue(mockWorkspacePath) @@ -90,7 +83,7 @@ describe("CustomModesManager - Export/Import with Slug Changes", () => { }) afterEach(() => { - vi.clearAllMocks() + clearAllMocks() }) describe("Export Path Calculation", () => { diff --git a/src/core/config/__tests__/CustomModesManager.spec.ts b/src/core/config/__tests__/CustomModesManager.spec.ts index 775ae64489..71ed60ee40 100644 --- a/src/core/config/__tests__/CustomModesManager.spec.ts +++ b/src/core/config/__tests__/CustomModesManager.spec.ts @@ -13,6 +13,8 @@ import type { ModeConfig } from "@roo-code/types" import { fileExistsAtPath } from "../../../utils/fs" import { getWorkspacePath, arePathsEqual } from "../../../utils/path" import { GlobalFileNames } from "../../../shared/globalFileNames" +import { clearAllMocks } from "../../../test-utils/reset" +import { makeExtensionContext, makeUri } from "../../../test-utils/vscode" import { CustomModesManager } from "../CustomModesManager" @@ -53,20 +55,11 @@ describe("CustomModesManager", () => { beforeEach(() => { mockOnUpdate = vi.fn() - mockContext = { - globalState: { - get: vi.fn(), - update: vi.fn(), - keys: vi.fn(() => []), - setKeysForSync: vi.fn(), - }, - globalStorageUri: { - fsPath: mockStoragePath, - }, - } as unknown as vscode.ExtensionContext + mockContext = makeExtensionContext({ globalStorageUri: makeUri(mockStoragePath) }) + mockContext.globalState.setKeysForSync = vi.fn() // mockWorkspacePath is now defined at the top level - mockWorkspaceFolders = [{ uri: { fsPath: mockWorkspacePath } }] + mockWorkspaceFolders = [{ uri: makeUri(mockWorkspacePath) }] ;(vscode.workspace as any).workspaceFolders = mockWorkspaceFolders ;(vscode.workspace.onDidSaveTextDocument as Mock).mockReturnValue({ dispose: vi.fn() }) ;(getWorkspacePath as Mock).mockReturnValue(mockWorkspacePath) @@ -90,7 +83,7 @@ describe("CustomModesManager", () => { }) afterEach(() => { - vi.clearAllMocks() + clearAllMocks() }) describe("getCustomModes", () => { diff --git a/src/core/config/__tests__/CustomModesManager.yamlEdgeCases.spec.ts b/src/core/config/__tests__/CustomModesManager.yamlEdgeCases.spec.ts index cad28ef94c..eab01eee41 100644 --- a/src/core/config/__tests__/CustomModesManager.yamlEdgeCases.spec.ts +++ b/src/core/config/__tests__/CustomModesManager.yamlEdgeCases.spec.ts @@ -13,6 +13,8 @@ import type { ModeConfig } from "@roo-code/types" import { fileExistsAtPath } from "../../../utils/fs" import { getWorkspacePath } from "../../../utils/path" import { GlobalFileNames } from "../../../shared/globalFileNames" +import { clearAllMocks } from "../../../test-utils/reset" +import { makeExtensionContext, makeUri } from "../../../test-utils/vscode" import { CustomModesManager } from "../CustomModesManager" @@ -52,19 +54,10 @@ describe("CustomModesManager - YAML Edge Cases", () => { beforeEach(() => { mockOnUpdate = vi.fn() - mockContext = { - globalState: { - get: vi.fn(), - update: vi.fn(), - keys: vi.fn(() => []), - setKeysForSync: vi.fn(), - }, - globalStorageUri: { - fsPath: mockStoragePath, - }, - } as unknown as vscode.ExtensionContext - - mockWorkspaceFolders = [{ uri: { fsPath: "/mock/workspace" } }] + mockContext = makeExtensionContext({ globalStorageUri: makeUri(mockStoragePath) }) + mockContext.globalState.setKeysForSync = vi.fn() + + mockWorkspaceFolders = [{ uri: makeUri("/mock/workspace") }] ;(vscode.workspace as any).workspaceFolders = mockWorkspaceFolders ;(vscode.workspace.onDidSaveTextDocument as Mock).mockReturnValue({ dispose: vi.fn() }) ;(getWorkspacePath as Mock).mockReturnValue("/mock/workspace") @@ -92,7 +85,7 @@ describe("CustomModesManager - YAML Edge Cases", () => { }) afterEach(() => { - vi.clearAllMocks() + clearAllMocks() }) describe("BOM (Byte Order Mark) handling", () => {