Skip to content

Commit c71c059

Browse files
committed
refactor: reuse shared CustomModesManager test helpers
1 parent 276e425 commit c71c059

3 files changed

Lines changed: 19 additions & 40 deletions

File tree

‎src/core/config/__tests__/CustomModesManager.exportImportSlugChange.spec.ts‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import type { ModeConfig } from "@roo-code/types"
1313
import { fileExistsAtPath } from "../../../utils/fs"
1414
import { getWorkspacePath } from "../../../utils/path"
1515
import { GlobalFileNames } from "../../../shared/globalFileNames"
16+
import { clearAllMocks } from "../../../test-utils/reset"
17+
import { makeExtensionContext, makeUri } from "../../../test-utils/vscode"
1618

1719
import { CustomModesManager } from "../CustomModesManager"
1820

@@ -53,20 +55,11 @@ describe("CustomModesManager - Export/Import with Slug Changes", () => {
5355

5456
beforeEach(() => {
5557
mockOnUpdate = vi.fn()
56-
mockContext = {
57-
globalState: {
58-
get: vi.fn(),
59-
update: vi.fn(),
60-
keys: vi.fn(() => []),
61-
setKeysForSync: vi.fn(),
62-
},
63-
globalStorageUri: {
64-
fsPath: mockStoragePath,
65-
},
66-
} as unknown as vscode.ExtensionContext
58+
mockContext = makeExtensionContext({ globalStorageUri: makeUri(mockStoragePath) })
59+
mockContext.globalState.setKeysForSync = vi.fn()
6760

6861
// mockWorkspacePath is now defined at the top level
69-
mockWorkspaceFolders = [{ uri: { fsPath: mockWorkspacePath } }]
62+
mockWorkspaceFolders = [{ uri: makeUri(mockWorkspacePath) }]
7063
;(vscode.workspace as any).workspaceFolders = mockWorkspaceFolders
7164
;(vscode.workspace.onDidSaveTextDocument as Mock).mockReturnValue({ dispose: vi.fn() })
7265
;(getWorkspacePath as Mock).mockReturnValue(mockWorkspacePath)
@@ -90,7 +83,7 @@ describe("CustomModesManager - Export/Import with Slug Changes", () => {
9083
})
9184

9285
afterEach(() => {
93-
vi.clearAllMocks()
86+
clearAllMocks()
9487
})
9588

9689
describe("Export Path Calculation", () => {

‎src/core/config/__tests__/CustomModesManager.spec.ts‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import type { ModeConfig } from "@roo-code/types"
1313
import { fileExistsAtPath } from "../../../utils/fs"
1414
import { getWorkspacePath, arePathsEqual } from "../../../utils/path"
1515
import { GlobalFileNames } from "../../../shared/globalFileNames"
16+
import { clearAllMocks } from "../../../test-utils/reset"
17+
import { makeExtensionContext, makeUri } from "../../../test-utils/vscode"
1618

1719
import { CustomModesManager } from "../CustomModesManager"
1820

@@ -53,20 +55,11 @@ describe("CustomModesManager", () => {
5355

5456
beforeEach(() => {
5557
mockOnUpdate = vi.fn()
56-
mockContext = {
57-
globalState: {
58-
get: vi.fn(),
59-
update: vi.fn(),
60-
keys: vi.fn(() => []),
61-
setKeysForSync: vi.fn(),
62-
},
63-
globalStorageUri: {
64-
fsPath: mockStoragePath,
65-
},
66-
} as unknown as vscode.ExtensionContext
58+
mockContext = makeExtensionContext({ globalStorageUri: makeUri(mockStoragePath) })
59+
mockContext.globalState.setKeysForSync = vi.fn()
6760

6861
// mockWorkspacePath is now defined at the top level
69-
mockWorkspaceFolders = [{ uri: { fsPath: mockWorkspacePath } }]
62+
mockWorkspaceFolders = [{ uri: makeUri(mockWorkspacePath) }]
7063
;(vscode.workspace as any).workspaceFolders = mockWorkspaceFolders
7164
;(vscode.workspace.onDidSaveTextDocument as Mock).mockReturnValue({ dispose: vi.fn() })
7265
;(getWorkspacePath as Mock).mockReturnValue(mockWorkspacePath)
@@ -90,7 +83,7 @@ describe("CustomModesManager", () => {
9083
})
9184

9285
afterEach(() => {
93-
vi.clearAllMocks()
86+
clearAllMocks()
9487
})
9588

9689
describe("getCustomModes", () => {

‎src/core/config/__tests__/CustomModesManager.yamlEdgeCases.spec.ts‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import type { ModeConfig } from "@roo-code/types"
1313
import { fileExistsAtPath } from "../../../utils/fs"
1414
import { getWorkspacePath } from "../../../utils/path"
1515
import { GlobalFileNames } from "../../../shared/globalFileNames"
16+
import { clearAllMocks } from "../../../test-utils/reset"
17+
import { makeExtensionContext, makeUri } from "../../../test-utils/vscode"
1618

1719
import { CustomModesManager } from "../CustomModesManager"
1820

@@ -52,19 +54,10 @@ describe("CustomModesManager - YAML Edge Cases", () => {
5254

5355
beforeEach(() => {
5456
mockOnUpdate = vi.fn()
55-
mockContext = {
56-
globalState: {
57-
get: vi.fn(),
58-
update: vi.fn(),
59-
keys: vi.fn(() => []),
60-
setKeysForSync: vi.fn(),
61-
},
62-
globalStorageUri: {
63-
fsPath: mockStoragePath,
64-
},
65-
} as unknown as vscode.ExtensionContext
66-
67-
mockWorkspaceFolders = [{ uri: { fsPath: "/mock/workspace" } }]
57+
mockContext = makeExtensionContext({ globalStorageUri: makeUri(mockStoragePath) })
58+
mockContext.globalState.setKeysForSync = vi.fn()
59+
60+
mockWorkspaceFolders = [{ uri: makeUri("/mock/workspace") }]
6861
;(vscode.workspace as any).workspaceFolders = mockWorkspaceFolders
6962
;(vscode.workspace.onDidSaveTextDocument as Mock).mockReturnValue({ dispose: vi.fn() })
7063
;(getWorkspacePath as Mock).mockReturnValue("/mock/workspace")
@@ -92,7 +85,7 @@ describe("CustomModesManager - YAML Edge Cases", () => {
9285
})
9386

9487
afterEach(() => {
95-
vi.clearAllMocks()
88+
clearAllMocks()
9689
})
9790

9891
describe("BOM (Byte Order Mark) handling", () => {

0 commit comments

Comments
 (0)