Skip to content

Commit f8438d8

Browse files
edelaunaedelauna
committed
fixup! fix(vitest4): migrate tests and configs for vitest 4 compatibility
1 parent b72d3a9 commit f8438d8

201 files changed

Lines changed: 3667 additions & 2494 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/core/src/worktree/__tests__/worktree-include.integration.spec.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ describe.sequential("WorktreeIncludeService integration", () => {
3838
await execGit(repoDir, ["init"])
3939
await execGit(repoDir, ["config", "user.name", "Test User"])
4040
await execGit(repoDir, ["config", "user.email", "test@example.com"])
41+
await execGit(repoDir, ["config", "commit.gpgSign", "false"])
4142

4243
await fs.writeFile(path.join(repoDir, "README.md"), "test")
4344
await execGit(repoDir, ["add", "README.md"])

‎packages/core/src/worktree/__tests__/worktree-service.integration.spec.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ describe.sequential("WorktreeService integration", () => {
2828
await execGit(repoDir, ["init"])
2929
await execGit(repoDir, ["config", "user.name", "Test User"])
3030
await execGit(repoDir, ["config", "user.email", "test@example.com"])
31+
await execGit(repoDir, ["config", "commit.gpgSign", "false"])
3132
await fs.writeFile(path.join(repoDir, "README.md"), "base")
3233
await execGit(repoDir, ["add", "README.md"])
3334
await execGit(repoDir, ["commit", "-m", "init"])

‎packages/ipc/tsconfig.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"extends": "@roo-code/config-typescript/base.json",
3+
"compilerOptions": {
4+
"types": ["node"]
5+
},
36
"include": ["src"],
47
"exclude": ["node_modules"]
58
}

‎packages/telemetry/src/__tests__/PostHogTelemetryClient.test.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ describe("PostHogTelemetryClient", () => {
3737
optOut: vi.fn(),
3838
shutdown: vi.fn().mockResolvedValue(undefined),
3939
}
40-
;(PostHog as any).mockImplementation(() => mockPostHogClient)
40+
;(PostHog as any).mockImplementation(function () {
41+
return mockPostHogClient
42+
})
4143

4244
// @ts-expect-error - Accessing private static property for testing
4345
PostHogTelemetryClient._instance = undefined

‎src/__tests__/extension.spec.ts‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,22 +158,28 @@ vi.mock("../utils/autoImportSettings", () => ({
158158
}))
159159

160160
vi.mock("../extension/api", () => ({
161-
API: vi.fn().mockImplementation(() => ({})),
161+
API: vi.fn().mockImplementation(function () {
162+
return {}
163+
}),
162164
}))
163165

164166
vi.mock("../activate", () => ({
165167
handleUri: vi.fn(),
166168
registerCommands: vi.fn(),
167169
registerCodeActions: vi.fn(),
168170
registerTerminalActions: vi.fn(),
169-
CodeActionProvider: vi.fn().mockImplementation(() => ({
170-
providedCodeActionKinds: [],
171-
})),
171+
CodeActionProvider: vi.fn().mockImplementation(function () {
172+
return {
173+
providedCodeActionKinds: [],
174+
}
175+
}),
172176
}))
173177

174178
vi.mock("../i18n", () => ({
175179
initializeI18n: vi.fn(),
176-
t: vi.fn((key) => key),
180+
t: vi.fn(function (key) {
181+
return key
182+
}),
177183
}))
178184

179185
// Mock ClineProvider
@@ -192,7 +198,9 @@ vi.mock("../core/webview/ClineProvider", async () => {
192198
}
193199
return {
194200
ClineProvider: Object.assign(
195-
vi.fn().mockImplementation(() => mockInstance),
201+
vi.fn().mockImplementation(function () {
202+
return mockInstance
203+
}),
196204
{
197205
// Static method used by extension.ts
198206
getVisibleInstance: vi.fn().mockReturnValue(mockInstance),

‎src/__tests__/history-resume-delegation.spec.ts‎

Lines changed: 57 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,21 @@ import { RooCodeEventName } from "@roo-code/types"
66
/* vscode mock for Task/Provider imports */
77
vi.mock("vscode", () => {
88
const window = {
9-
createTextEditorDecorationType: vi.fn(() => ({ dispose: vi.fn() })),
9+
createTextEditorDecorationType: vi.fn(function () {
10+
return { dispose: vi.fn() }
11+
}),
1012
showErrorMessage: vi.fn(),
11-
onDidChangeActiveTextEditor: vi.fn(() => ({ dispose: vi.fn() })),
13+
onDidChangeActiveTextEditor: vi.fn(function () {
14+
return { dispose: vi.fn() }
15+
}),
1216
}
1317
const workspace = {
14-
getConfiguration: vi.fn(() => ({
15-
get: vi.fn((_key: string, defaultValue: any) => defaultValue),
16-
update: vi.fn(),
17-
})),
18+
getConfiguration: vi.fn(function () {
19+
return {
20+
get: vi.fn((_key: string, defaultValue: any) => defaultValue),
21+
update: vi.fn(),
22+
}
23+
}),
1824
workspaceFolders: [],
1925
}
2026
const env = { machineId: "test-machine", uriScheme: "vscode", appName: "VSCode", language: "en", sessionId: "sess" }
@@ -76,7 +82,9 @@ describe("History resume delegation - parent metadata transitions", () => {
7682
contextProxy: { globalStorageUri: { fsPath: "/tmp" } },
7783
getTaskWithId,
7884
emit: providerEmit,
79-
getCurrentTask: vi.fn(() => ({ taskId: "child-1" })),
85+
getCurrentTask: vi.fn(function () {
86+
return { taskId: "child-1" }
87+
}),
8088
removeClineFromStack,
8189
createTaskWithHistoryItem,
8290
updateTaskHistory,
@@ -138,7 +146,9 @@ describe("History resume delegation - parent metadata transitions", () => {
138146
},
139147
}),
140148
emit: vi.fn(),
141-
getCurrentTask: vi.fn(() => ({ taskId: "c1" })),
149+
getCurrentTask: vi.fn(function () {
150+
return { taskId: "c1" }
151+
}),
142152
removeClineFromStack: vi.fn().mockResolvedValue(undefined),
143153
createTaskWithHistoryItem: vi.fn().mockResolvedValue({
144154
taskId: "p1",
@@ -221,7 +231,9 @@ describe("History resume delegation - parent metadata transitions", () => {
221231
},
222232
}),
223233
emit: vi.fn(),
224-
getCurrentTask: vi.fn(() => ({ taskId: "c-tool" })),
234+
getCurrentTask: vi.fn(function () {
235+
return { taskId: "c-tool" }
236+
}),
225237
removeClineFromStack: vi.fn().mockResolvedValue(undefined),
226238
createTaskWithHistoryItem: vi.fn().mockResolvedValue({
227239
taskId: "p-tool",
@@ -307,7 +319,9 @@ describe("History resume delegation - parent metadata transitions", () => {
307319
},
308320
}),
309321
emit: vi.fn(),
310-
getCurrentTask: vi.fn(() => ({ taskId: "c-no-tool" })),
322+
getCurrentTask: vi.fn(function () {
323+
return { taskId: "c-no-tool" }
324+
}),
311325
removeClineFromStack: vi.fn().mockResolvedValue(undefined),
312326
createTaskWithHistoryItem: vi.fn().mockResolvedValue({
313327
taskId: "p-no-tool",
@@ -367,7 +381,9 @@ describe("History resume delegation - parent metadata transitions", () => {
367381
},
368382
}),
369383
emit: vi.fn(),
370-
getCurrentTask: vi.fn(() => ({ taskId: "child-2" })),
384+
getCurrentTask: vi.fn(function () {
385+
return { taskId: "child-2" }
386+
}),
371387
removeClineFromStack: vi.fn().mockResolvedValue(undefined),
372388
createTaskWithHistoryItem: vi.fn().mockResolvedValue(parentInstance),
373389
updateTaskHistory: vi.fn().mockResolvedValue([]),
@@ -407,7 +423,9 @@ describe("History resume delegation - parent metadata transitions", () => {
407423
},
408424
}),
409425
emit: emitSpy,
410-
getCurrentTask: vi.fn(() => ({ taskId: "c3" })),
426+
getCurrentTask: vi.fn(function () {
427+
return { taskId: "c3" }
428+
}),
411429
removeClineFromStack: vi.fn().mockResolvedValue(undefined),
412430
createTaskWithHistoryItem: vi.fn().mockResolvedValue({
413431
resumeAfterDelegation: vi.fn().mockResolvedValue(undefined),
@@ -489,7 +507,9 @@ describe("History resume delegation - parent metadata transitions", () => {
489507
}
490508
}),
491509
emit: emitSpy,
492-
getCurrentTask: vi.fn(() => ({ taskId: "child-rpd06" })),
510+
getCurrentTask: vi.fn(function () {
511+
return { taskId: "child-rpd06" }
512+
}),
493513
removeClineFromStack: vi.fn().mockResolvedValue(undefined),
494514
createTaskWithHistoryItem: vi.fn().mockResolvedValue(parentInstance),
495515
updateTaskHistory: vi.fn().mockResolvedValue([]),
@@ -543,7 +563,9 @@ describe("History resume delegation - parent metadata transitions", () => {
543563
},
544564
}),
545565
emit: emitSpy,
546-
getCurrentTask: vi.fn(() => ({ taskId: "c4" })),
566+
getCurrentTask: vi.fn(function () {
567+
return { taskId: "c4" }
568+
}),
547569
removeClineFromStack: vi.fn().mockResolvedValue(undefined),
548570
createTaskWithHistoryItem: vi.fn().mockResolvedValue({
549571
resumeAfterDelegation: vi.fn().mockResolvedValue(undefined),
@@ -611,7 +633,9 @@ describe("History resume delegation - parent metadata transitions", () => {
611633
}
612634
}),
613635
emit: vi.fn(),
614-
getCurrentTask: vi.fn(() => ({ taskId: "different-open-task" })),
636+
getCurrentTask: vi.fn(function () {
637+
return { taskId: "different-open-task" }
638+
}),
615639
removeClineFromStack,
616640
createTaskWithHistoryItem,
617641
updateTaskHistory,
@@ -692,7 +716,9 @@ describe("History resume delegation - parent metadata transitions", () => {
692716
}),
693717
emit: emitSpy,
694718
log: logSpy,
695-
getCurrentTask: vi.fn(() => ({ taskId: "child-rpd04" })),
719+
getCurrentTask: vi.fn(function () {
720+
return { taskId: "child-rpd04" }
721+
}),
696722
removeClineFromStack: vi.fn().mockResolvedValue(undefined),
697723
createTaskWithHistoryItem: vi.fn().mockResolvedValue(parentInstance),
698724
updateTaskHistory,
@@ -745,7 +771,9 @@ describe("History resume delegation - parent metadata transitions", () => {
745771
},
746772
}),
747773
emit: vi.fn(),
748-
getCurrentTask: vi.fn(() => ({ taskId: "child-rpd05" })),
774+
getCurrentTask: vi.fn(function () {
775+
return { taskId: "child-rpd05" }
776+
}),
749777
removeClineFromStack,
750778
createTaskWithHistoryItem,
751779
updateTaskHistory: vi.fn().mockRejectedValue(persistError),
@@ -783,7 +811,9 @@ describe("History resume delegation - parent metadata transitions", () => {
783811
},
784812
}),
785813
emit: vi.fn(),
786-
getCurrentTask: vi.fn(() => ({ taskId: "c5" })),
814+
getCurrentTask: vi.fn(function () {
815+
return { taskId: "c5" }
816+
}),
787817
removeClineFromStack: vi.fn().mockResolvedValue(undefined),
788818
createTaskWithHistoryItem: vi.fn().mockResolvedValue({
789819
resumeAfterDelegation: vi.fn().mockResolvedValue(undefined),
@@ -840,7 +870,9 @@ describe("History resume delegation - parent metadata transitions", () => {
840870
getTaskWithId: vi.fn().mockResolvedValue({ historyItem }),
841871
emit: vi.fn(),
842872
log: logSpy,
843-
getCurrentTask: vi.fn(() => null),
873+
getCurrentTask: vi.fn(function () {
874+
return null
875+
}),
844876
removeClineFromStack: vi.fn(),
845877
createTaskWithHistoryItem: vi.fn(),
846878
updateTaskHistory,
@@ -880,7 +912,9 @@ describe("History resume delegation - parent metadata transitions", () => {
880912
}),
881913
emit: vi.fn(),
882914
log: logSpy,
883-
getCurrentTask: vi.fn(() => null),
915+
getCurrentTask: vi.fn(function () {
916+
return null
917+
}),
884918
removeClineFromStack: vi.fn(),
885919
createTaskWithHistoryItem: vi.fn(),
886920
updateTaskHistory,
@@ -913,7 +947,9 @@ describe("History resume delegation - parent metadata transitions", () => {
913947
getTaskWithId: vi.fn().mockResolvedValue({ historyItem }),
914948
emit: vi.fn(),
915949
log: logSpy,
916-
getCurrentTask: vi.fn(() => null),
950+
getCurrentTask: vi.fn(function () {
951+
return null
952+
}),
917953
removeClineFromStack: vi.fn(),
918954
createTaskWithHistoryItem: vi.fn(),
919955
updateTaskHistory,

‎src/__tests__/nested-delegation-resume.spec.ts‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,21 @@ vi.mock("@roo-code/telemetry", () => ({
2121
// vscode mock for Task/Provider imports
2222
vi.mock("vscode", () => {
2323
const window = {
24-
createTextEditorDecorationType: vi.fn(() => ({ dispose: vi.fn() })),
24+
createTextEditorDecorationType: vi.fn(function () {
25+
return { dispose: vi.fn() }
26+
}),
2527
showErrorMessage: vi.fn(),
26-
onDidChangeActiveTextEditor: vi.fn(() => ({ dispose: vi.fn() })),
28+
onDidChangeActiveTextEditor: vi.fn(function () {
29+
return { dispose: vi.fn() }
30+
}),
2731
}
2832
const workspace = {
29-
getConfiguration: vi.fn(() => ({
30-
get: vi.fn((_key: string, defaultValue: any) => defaultValue),
31-
update: vi.fn(),
32-
})),
33+
getConfiguration: vi.fn(function () {
34+
return {
35+
get: vi.fn((_key: string, defaultValue: any) => defaultValue),
36+
update: vi.fn(),
37+
}
38+
}),
3339
workspaceFolders: [],
3440
}
3541
const env = { machineId: "test-machine", uriScheme: "vscode", appName: "VSCode", language: "en", sessionId: "sess" }
@@ -153,7 +159,9 @@ describe("Nested delegation resume (A → B → C)", () => {
153159
contextProxy: { globalStorageUri: { fsPath: "/tmp" } },
154160
getTaskWithId,
155161
emit: emitSpy,
156-
getCurrentTask: vi.fn(() => (currentActiveId ? ({ taskId: currentActiveId } as any) : undefined)),
162+
getCurrentTask: vi.fn(function () {
163+
return currentActiveId ? ({ taskId: currentActiveId } as any) : undefined
164+
}),
157165
removeClineFromStack,
158166
createTaskWithHistoryItem,
159167
updateTaskHistory,
@@ -176,7 +184,9 @@ describe("Nested delegation resume (A → B → C)", () => {
176184
providerRef: { deref: () => provider },
177185
say: vi.fn().mockResolvedValue(undefined),
178186
emit: vi.fn(),
179-
getTokenUsage: vi.fn(() => ({})),
187+
getTokenUsage: vi.fn(function () {
188+
return {}
189+
}),
180190
toolUsage: {},
181191
clineMessages: [],
182192
userMessageContent: [],
@@ -223,7 +233,9 @@ describe("Nested delegation resume (A → B → C)", () => {
223233
providerRef: { deref: () => provider },
224234
say: vi.fn().mockResolvedValue(undefined),
225235
emit: vi.fn(),
226-
getTokenUsage: vi.fn(() => ({})),
236+
getTokenUsage: vi.fn(function () {
237+
return {}
238+
}),
227239
toolUsage: {},
228240
clineMessages: [],
229241
userMessageContent: [],

‎src/__tests__/provider-delegation.spec.ts‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ describe("ClineProvider.delegateParentAndOpenChild()", () => {
4141

4242
const provider = {
4343
emit: providerEmit,
44-
getCurrentTask: vi.fn(() => parentTask),
44+
getCurrentTask: vi.fn(function () {
45+
return parentTask
46+
}),
4547
removeClineFromStack,
4648
createTask,
4749
getTaskWithId,
@@ -102,7 +104,9 @@ describe("ClineProvider.delegateParentAndOpenChild()", () => {
102104
taskId: "parent-1",
103105
emit: vi.fn(),
104106
} as any
105-
const childStart = vi.fn(() => callOrder.push("child.start"))
107+
const childStart = vi.fn(function () {
108+
return callOrder.push("child.start")
109+
})
106110

107111
const updateTaskHistory = vi.fn(async () => {
108112
callOrder.push("updateTaskHistory")
@@ -126,7 +130,9 @@ describe("ClineProvider.delegateParentAndOpenChild()", () => {
126130

127131
const provider = {
128132
emit: vi.fn(),
129-
getCurrentTask: vi.fn(() => parentTask),
133+
getCurrentTask: vi.fn(function () {
134+
return parentTask
135+
}),
130136
removeClineFromStack,
131137
createTask,
132138
getTaskWithId,
@@ -167,7 +173,9 @@ describe("ClineProvider.delegateParentAndOpenChild()", () => {
167173

168174
const provider = {
169175
emit: vi.fn(),
170-
getCurrentTask: vi.fn(() => parentTask),
176+
getCurrentTask: vi.fn(function () {
177+
return parentTask
178+
}),
171179
removeClineFromStack,
172180
createTask: vi.fn().mockResolvedValue({ taskId: "child-1", start: childStart }),
173181
getTaskWithId: vi.fn().mockResolvedValue({ historyItem: parentHistory }),

0 commit comments

Comments
 (0)