Skip to content

Commit ae608c9

Browse files
fix: no test-only exports (knip); use providerIdentifiers in the new spec
1 parent 22b2e5d commit ae608c9

6 files changed

Lines changed: 43 additions & 36 deletions

File tree

‎src/core/webview/__tests__/mcpEnabledChanges.spec.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import { changeMcpEnabled, reconcileMcpEnabled, type McpOwner } from "../mcpEnabledChanges"
1+
import { changeMcpEnabled, reconcileMcpEnabled } from "../mcpEnabledChanges"
2+
3+
type McpOwner = Parameters<typeof reconcileMcpEnabled>[1]
24

35
const createHub = () => {
46
const releases: Array<() => void> = []

‎src/core/webview/__tests__/storeInOrder.spec.ts‎

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,42 @@
1-
import { resetStoreInOrder, storeInOrder, storeInOrderKeys } from "../storeInOrder"
1+
import { storeInOrder } from "../storeInOrder"
22

33
const controllable = () => {
44
const finish: Array<{ resolve: () => void; reject: (error: unknown) => void }> = []
55
const write = vi.fn(() => new Promise<void>((resolve, reject) => finish.push({ resolve, reject })))
66
return { write, finish }
77
}
88

9+
let counter = 0
10+
// Each test has a key of its own: what one leaves in line cannot reach another.
11+
let current = "key"
12+
const keyOf = () => current
13+
914
describe("storeInOrder", () => {
10-
afterEach(() => resetStoreInOrder())
15+
beforeEach(() => {
16+
current = `key-${++counter}`
17+
})
1118

1219
it("runs a write at once when nothing of that key is in line, and keeps nothing once it is done", async () => {
1320
const { write, finish } = controllable()
1421

15-
const stored = storeInOrder("key", write)
22+
const stored = storeInOrder(keyOf(), write)
1623
await vi.waitFor(() => expect(write).toHaveBeenCalledTimes(1))
1724
finish[0].resolve()
1825
await stored
1926

20-
expect(storeInOrderKeys()).toEqual([])
27+
// Nothing is left in line: the next write of the key starts at once.
28+
const next = controllable()
29+
void storeInOrder(keyOf(), next.write)
30+
await vi.waitFor(() => expect(next.write).toHaveBeenCalledTimes(1))
31+
next.finish[0].resolve()
2132
})
2233

2334
it("starts a write of the same key only when the one before it has settled", async () => {
2435
const first = controllable()
2536
const second = controllable()
2637

27-
const a = storeInOrder("key", first.write)
28-
const b = storeInOrder("key", second.write)
38+
const a = storeInOrder(keyOf(), first.write)
39+
const b = storeInOrder(keyOf(), second.write)
2940
await vi.waitFor(() => expect(first.write).toHaveBeenCalledTimes(1))
3041
expect(second.write).not.toHaveBeenCalled()
3142

@@ -34,17 +45,16 @@ describe("storeInOrder", () => {
3445
await vi.waitFor(() => expect(second.write).toHaveBeenCalledTimes(1))
3546
second.finish[0].resolve()
3647
await b
37-
expect(storeInOrderKeys()).toEqual([])
3848
})
3949

4050
it("keeps one write waiting at most: a newer one replaces it, and every caller is answered by the one that runs", async () => {
4151
const running = controllable()
4252
const replaced = controllable()
4353
const latest = controllable()
4454

45-
const a = storeInOrder("key", running.write)
46-
const b = storeInOrder("key", replaced.write)
47-
const c = storeInOrder("key", latest.write)
55+
const a = storeInOrder(keyOf(), running.write)
56+
const b = storeInOrder(keyOf(), replaced.write)
57+
const c = storeInOrder(keyOf(), latest.write)
4858
expect(c).toBe(b)
4959
await vi.waitFor(() => expect(running.write).toHaveBeenCalledTimes(1))
5060
running.finish[0].resolve()
@@ -60,8 +70,8 @@ describe("storeInOrder", () => {
6070
const stalled = controllable()
6171
const other = controllable()
6272

63-
void storeInOrder("a", stalled.write)
64-
const b = storeInOrder("b", other.write)
73+
void storeInOrder(`${keyOf()}-a`, stalled.write)
74+
const b = storeInOrder(`${keyOf()}-b`, other.write)
6575
await vi.waitFor(() => expect(other.write).toHaveBeenCalledTimes(1))
6676
other.finish[0].resolve()
6777
await b
@@ -71,9 +81,9 @@ describe("storeInOrder", () => {
7181
const first = controllable()
7282
const second = controllable()
7383

74-
const a = storeInOrder("key", first.write)
84+
const a = storeInOrder(keyOf(), first.write)
7585
const aFailed = expect(a).rejects.toThrow("storage unavailable")
76-
const b = storeInOrder("key", second.write)
86+
const b = storeInOrder(keyOf(), second.write)
7787
await vi.waitFor(() => expect(first.write).toHaveBeenCalledTimes(1))
7888
first.finish[0].reject(new Error("storage unavailable"))
7989
await aFailed
@@ -86,11 +96,11 @@ describe("storeInOrder", () => {
8696
it("reports a write that throws before it returns a promise, and goes on", async () => {
8797
const next = controllable()
8898

89-
const a = storeInOrder("key", () => {
99+
const a = storeInOrder(keyOf(), () => {
90100
throw new Error("sync failure")
91101
})
92102
await expect(a).rejects.toThrow("sync failure")
93-
const b = storeInOrder("key", next.write)
103+
const b = storeInOrder(keyOf(), next.write)
94104
await vi.waitFor(() => expect(next.write).toHaveBeenCalledTimes(1))
95105
next.finish[0].resolve()
96106
await b
@@ -100,7 +110,7 @@ describe("storeInOrder", () => {
100110
const unhandled = vi.fn()
101111
process.on("unhandledRejection", unhandled)
102112
try {
103-
void storeInOrder("key", async () => Promise.reject(new Error("nobody waits")))
113+
void storeInOrder(keyOf(), async () => Promise.reject(new Error("nobody waits")))
104114
await new Promise((resolve) => setTimeout(resolve, 20))
105115
expect(unhandled).not.toHaveBeenCalled()
106116
} finally {

‎src/core/webview/__tests__/webviewMessageHandler.spec.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ import { flushModels, getModels } from "../../../api/providers/fetchers/modelCac
9090
import { getLMStudioModels } from "../../../api/providers/fetchers/lmstudio"
9191
import { getCommands } from "../../../services/command/commands"
9292
import { ensureDcgInstalled } from "../../../services/destructive-command-guard"
93-
import { resetStoreInOrder } from "../storeInOrder"
9493
import {
9594
handleCreateRule,
9695
handleDeleteRule,
@@ -2549,19 +2548,23 @@ describe("webviewMessageHandler - the appearance settings are saved all-or-nothi
25492548
})
25502549

25512550
describe("when a later setting of the save never finishes being stored", () => {
2551+
const hung: Array<() => void> = []
25522552
beforeEach(() => vi.useFakeTimers())
25532553
afterEach(() => {
25542554
vi.useRealTimers()
25552555
Reflect.deleteProperty(mockClineProvider, "isDisposed")
2556-
resetStoreInOrder() // a store that never settled is still in line: the next test starts without it
2556+
// A store that never settled is still in line for its key: it settles now, so that the next test finds the key free.
2557+
for (const settle of hung.splice(0)) settle()
25572558
})
25582559

2559-
/** The store of `key` never settles, as a hung `globalState.update` would not. */
2560+
/** The store of `key` never settles (until the test is over), as a hung `globalState.update` would not. */
25602561
const hangOn = (key: string) => {
25612562
const real = vi.mocked(mockClineProvider.contextProxy.setValue).getMockImplementation()!
25622563
vi.mocked(mockClineProvider.contextProxy.setValue).mockImplementation(
25632564
(k: string, v: unknown): Promise<void> =>
2564-
k === key ? new Promise<void>(() => {}) : (real(k as never, v as never) as Promise<void>),
2565+
k === key
2566+
? new Promise<void>((resolve) => hung.push(resolve))
2567+
: (real(k as never, v as never) as Promise<void>),
25652568
)
25662569
}
25672570
const resultsOf = () =>

‎src/core/webview/mcpEnabledChanges.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ interface HubChanges {
3232
}
3333

3434
/** What a reconciliation needs of a provider: whether it is gone, and the setting that it stores. */
35-
export interface McpOwner {
35+
interface McpOwner {
3636
readonly isDisposed?: boolean
3737
readonly contextProxy: { getValue(key: "mcpEnabled"): unknown }
3838
}

‎src/core/webview/storeInOrder.ts‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,3 @@ export function storeInOrder(key: string, write: () => Promise<void>): Promise<v
6161
slot.waiting = { write, promise, resolve, reject }
6262
return promise
6363
}
64-
65-
/** What is in line, for tests: the keys that have a write running or waiting. */
66-
export function storeInOrderKeys(): string[] {
67-
return [...slots.keys()]
68-
}
69-
70-
/** For tests: forgets what is in line, as a process that was started again would. */
71-
export function resetStoreInOrder(): void {
72-
slots.clear()
73-
}

‎webview-ui/src/components/settings/__tests__/SettingsView.dedicatedSetters.spec.tsx‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { act, fireEvent, screen, waitFor } from "@testing-library/react"
22
import { QueryClient } from "@tanstack/react-query"
33
import { describe, expect, it, vi } from "vitest"
44

5+
import { providerIdentifiers } from "@roo-code/types"
6+
57
import { renderWithExtensionState } from "@/utils/test-utils"
68

79
import SettingsView from "../SettingsView"
@@ -129,13 +131,13 @@ const cases: Case[] = [
129131
name: "the image generation provider",
130132
section: "experimental",
131133
key: "imageGenerationProvider",
132-
initial: { imageGenerationProvider: "openrouter" },
134+
initial: { imageGenerationProvider: providerIdentifiers.openrouter },
133135
answered: "failed",
134-
late: "openrouter",
136+
late: providerIdentifiers.openrouter,
135137
edit: "edit-image-provider",
136138
read: "image-provider-value",
137139
edited: "mine",
138-
lateText: "openrouter",
140+
lateText: providerIdentifiers.openrouter,
139141
answeredText: "failed",
140142
},
141143
{

0 commit comments

Comments
 (0)