Skip to content

Commit 22f1cf4

Browse files
committed
refactor: convert new test-utils stragglers to shared helpers
1 parent 1560907 commit 22f1cf4

17 files changed

Lines changed: 141 additions & 129 deletions

‎src/api/providers/__tests__/github-copilot.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ const mockLanguageModelChat = {
119119
}
120120

121121
describe("connectGitHubCopilot", () => {
122-
beforeEach(() => vi.clearAllMocks())
122+
beforeEach(() => clearAllMocks())
123123

124124
it("authenticates through VS Code and selects only Copilot models", async () => {
125125
vi.mocked(vscode.authentication.getSession).mockResolvedValue({
@@ -413,7 +413,7 @@ describe("Copilot model capabilities", () => {
413413
}
414414

415415
beforeEach(() => {
416-
vi.clearAllMocks()
416+
clearAllMocks()
417417
mockLanguageModelChat.countTokens.mockResolvedValue(10)
418418
mockLanguageModelChat.sendRequest.mockImplementation(async () => ({
419419
stream: (async function* () {
@@ -1322,7 +1322,7 @@ describe("getGitHubCopilotModels", () => {
13221322
...overrides,
13231323
})
13241324

1325-
beforeEach(() => vi.clearAllMocks())
1325+
beforeEach(() => clearAllMocks())
13261326

13271327
it("describes each model by identity and by the capabilities the host reports", async () => {
13281328
vi.mocked(vscode.lm.selectChatModels).mockResolvedValue([

‎src/api/providers/__tests__/io-intelligence.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { ioIntelligenceDefaultModelId, providerIdentifiers } from "@roo-code/typ
99

1010
import { buildApiHandler } from "../../index"
1111
import { asyncStreamFrom, collectStream } from "../../../test-utils/stream"
12+
import { clearAllMocks } from "../../../test-utils/reset"
1213
import { IOIntelligenceHandler } from "../io-intelligence"
1314
import { getModels } from "../fetchers/modelCache"
1415

@@ -42,7 +43,7 @@ const loggedText = (spy: { mock: { calls: unknown[][] } }) =>
4243

4344
describe("IOIntelligenceHandler", () => {
4445
beforeEach(() => {
45-
vi.clearAllMocks()
46+
clearAllMocks()
4647
vi.mocked(getModels).mockResolvedValue({
4748
"meta-llama/Llama-3.3-70B-Instruct": {
4849
maxTokens: 8192,

‎src/api/providers/__tests__/nanogpt.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { nanoGptDefaultModelId, providerIdentifiers } from "@roo-code/types"
99

1010
import { buildApiHandler } from "../../index"
1111
import { asyncStreamFrom, collectStream } from "../../../test-utils/stream"
12+
import { clearAllMocks } from "../../../test-utils/reset"
1213
import { createReadFileTool } from "../../../core/prompts/tools/native-tools/read_file"
1314
import { NanoGptHandler } from "../nanogpt"
1415
import { getModels } from "../fetchers/modelCache"
@@ -45,7 +46,7 @@ const messages: Anthropic.Messages.MessageParam[] = [{ role: "user", content: "H
4546

4647
describe("NanoGptHandler", () => {
4748
beforeEach(() => {
48-
vi.clearAllMocks()
49+
clearAllMocks()
4950
vi.mocked(getModels).mockResolvedValue({
5051
"model:thinking": {
5152
maxTokens: 128000,

‎src/api/providers/__tests__/vscode-lm.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6676,7 +6676,7 @@ describe("getVsCodeLmModels", () => {
66766676
...overrides,
66776677
})
66786678

6679-
beforeEach(() => vi.clearAllMocks())
6679+
beforeEach(() => clearAllMocks())
66806680

66816681
it("returns serializable model metadata with host-reported image support", async () => {
66826682
const model = liveModel({ capabilities: { supportsImageToText: true } })

‎src/services/code-index/__tests__/code-index-manager-registry.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import * as vscode from "vscode"
22
import { makeExtensionContext, makeTextDocument, makeTextEditor, makeUri } from "../../../test-utils/vscode"
3+
import { clearAllMocks } from "../../../test-utils/reset"
34
import { CodeIndexManager } from "../manager"
45
import { CodeIndexManagerRegistry } from "../code-index-manager-registry"
56
import { CodeIndexWorkspaceScope } from "../code-index-workspace-scope"
@@ -25,7 +26,7 @@ describe("CodeIndexManagerRegistry", () => {
2526
let second: vscode.WorkspaceFolder
2627

2728
beforeEach(() => {
28-
vi.clearAllMocks()
29+
clearAllMocks()
2930
context = makeExtensionContext()
3031
first = { uri: makeUri("/first"), name: "first", index: 0 }
3132
second = { uri: makeUri("/second"), name: "second", index: 1 }

‎src/services/code-index/__tests__/code-index-scope.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { makeExtensionContext } from "../../../test-utils/vscode"
2+
import { clearAllMocks } from "../../../test-utils/reset"
23
import { CodeIndexScope } from "../code-index-scope"
34
import { CodeIndexStatusManager } from "../code-index-status-manager"
45
import { CodeIndexManagerRegistry } from "../code-index-manager-registry"
@@ -9,7 +10,7 @@ vi.mock("../code-index-manager-registry", () => ({
910
}))
1011

1112
describe("CodeIndexScope", () => {
12-
beforeEach(() => vi.clearAllMocks())
13+
beforeEach(() => clearAllMocks())
1314

1415
it("creates, initializes and disposes its status manager", () => {
1516
const context = makeExtensionContext()

‎src/services/code-index/__tests__/code-index-status-manager.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
makeExtensionContext,
77
makeWorkspaceConfiguration,
88
} from "../../../test-utils/vscode"
9+
import { clearAllMocks } from "../../../test-utils/reset"
910
import { CodeIndexManager } from "../manager"
1011
import { CodeIndexStateManager } from "../state-manager"
1112
import { CodeIndexStatusManager, type CodeIndexStatus } from "../code-index-status-manager"
@@ -68,7 +69,7 @@ describe("CodeIndexStatusManager", () => {
6869
let disposeWorkspaceFolders: ReturnType<typeof vi.fn<() => void>>
6970

7071
beforeEach(() => {
71-
vi.clearAllMocks()
72+
clearAllMocks()
7273
vi.mocked(vscode.workspace.getConfiguration).mockReturnValue(makeWorkspaceConfiguration())
7374
Object.defineProperty(vscode.window, "activeTextEditor", { configurable: true, value: undefined })
7475
Object.defineProperty(vscode.workspace, "workspaceFolders", {

‎src/services/code-index/__tests__/code-index-workspace-scope.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { makeExtensionContext, makeUri } from "../../../test-utils/vscode"
2+
import { clearAllMocks } from "../../../test-utils/reset"
23
import { CodeIndexManager } from "../manager"
34
import { CodeIndexWorkspaceScope } from "../code-index-workspace-scope"
45
import { CodeIndexStateManager } from "../state-manager"
@@ -13,7 +14,7 @@ vi.mock("../manager", () => ({
1314
}))
1415

1516
describe("CodeIndexWorkspaceScope", () => {
16-
beforeEach(() => vi.clearAllMocks())
17+
beforeEach(() => clearAllMocks())
1718

1819
it("owns a guarded workspace indexing manager and recreates it after disposal", () => {
1920
const scope = new CodeIndexWorkspaceScope("/workspace", makeUri("/workspace"), makeExtensionContext())

‎src/services/code-index/embedders/__tests__/embedder-validation-manager.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { TelemetryService } from "@roo-code/telemetry"
22
import { TelemetryEventName } from "@roo-code/types"
33
import { t } from "../../../../i18n"
4+
import { clearAllMocks } from "../../../../test-utils/reset"
45
import embeddings from "../../../../i18n/locales/en/embeddings.json"
56
import { OpenAiEmbedder } from "../openai"
67
import { EmbedderValidationManager } from "../embedder-validation-manager"
@@ -14,7 +15,7 @@ vi.mock("@roo-code/telemetry", () => ({
1415
describe("EmbedderValidationManager", () => {
1516
const manager = new EmbedderValidationManager()
1617

17-
beforeEach(() => vi.clearAllMocks())
18+
beforeEach(() => clearAllMocks())
1819

1920
it.each([{ valid: true }, { valid: false, error: "Invalid credentials" }])(
2021
"preserves the validation result %j without reporting an exception",

‎src/services/code-index/processors/__tests__/processor-factories.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import * as vscode from "vscode"
22
import ignore from "ignore"
33
import { makeExtensionContext } from "../../../../test-utils/vscode"
4+
import { clearAllMocks } from "../../../../test-utils/reset"
45
import { Package } from "../../../../shared/package"
56
import { CacheManager } from "../../cache-manager"
67
import { BATCH_SEGMENT_THRESHOLD } from "../../constants"
@@ -30,7 +31,7 @@ vi.mock("../scanner")
3031
vi.mock("../file-watcher")
3132

3233
describe("processor factories", () => {
33-
beforeEach(() => vi.clearAllMocks())
34+
beforeEach(() => clearAllMocks())
3435
afterEach(() => vi.restoreAllMocks())
3536

3637
function dependencies() {

0 commit comments

Comments
 (0)