Skip to content

[Refactor] Reuse shared CustomModesManager test helpers #1190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edelauna merged 1 commit into from
Aug 8, 2026
+19 −40
Merged

[Refactor] Reuse shared CustomModesManager test helpers #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions src/core/config/__tests__/CustomModesManager.exportImportSlugChange.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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)
Expand All @@ -90,7 +83,7 @@ describe("CustomModesManager - Export/Import with Slug Changes", () => {
})

afterEach(() => {
vi.clearAllMocks()
clearAllMocks()
})

describe("Export Path Calculation", () => {
Expand Down
19 changes: 6 additions & 13 deletions src/core/config/__tests__/CustomModesManager.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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)
Expand All @@ -90,7 +83,7 @@ describe("CustomModesManager", () => {
})

afterEach(() => {
vi.clearAllMocks()
clearAllMocks()
})

describe("getCustomModes", () => {
Expand Down
21 changes: 7 additions & 14 deletions src/core/config/__tests__/CustomModesManager.yamlEdgeCases.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -92,7 +85,7 @@ describe("CustomModesManager - YAML Edge Cases", () => {
})

afterEach(() => {
vi.clearAllMocks()
clearAllMocks()
})

describe("BOM (Byte Order Mark) handling", () => {
Expand Down
Loading