Skip to content

Commit eed57af

Browse files
committed
test(friendli): cover ordinary IDs beside __proto__ and fetched default metadata
- useRouterModels: the refetched catalog keeps both __proto__ and an ordinary ID - useSelectedModel: an empty model ID uses fetched metadata for the default model
1 parent b7e9e97 commit eed57af

2 files changed

Lines changed: 25 additions & 4 deletions

File tree

‎webview-ui/src/components/ui/hooks/__tests__/useRouterModels.spec.ts‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,12 @@ describe("useRouterModels", () => {
100100
test("keeps an own __proto__ model ID when a refetch replaces an empty catalog", async () => {
101101
const provider = providerIdentifiers.friendli
102102
// JSON.parse keeps "__proto__" as an own key, as a message from the extension host does.
103-
const responses = [{ [provider]: {} }, JSON.parse(`{"${provider}": {"__proto__": {"contextWindow": 1000}}}`)]
103+
const responses = [
104+
{ [provider]: {} },
105+
JSON.parse(
106+
`{"${provider}": {"__proto__": {"contextWindow": 1000}, "vendor/model": {"contextWindow": 2000}}}`,
107+
),
108+
]
104109
vi.mocked(vscode.postMessage).mockImplementation(() => {
105110
const routerModels = responses.shift()
106111
queueMicrotask(() =>
@@ -120,8 +125,9 @@ describe("useRouterModels", () => {
120125
await result.current.refetch()
121126

122127
await waitFor(() => expect(Object.hasOwn(result.current.data?.[provider] ?? {}, "__proto__")).toBe(true))
123-
expect(Object.getOwnPropertyDescriptor(result.current.data?.[provider], "__proto__")?.value).toEqual({
124-
contextWindow: 1000,
125-
})
128+
const catalog = result.current.data?.[provider]
129+
expect(Object.keys(catalog ?? {})).toEqual(["__proto__", "vendor/model"])
130+
expect(Object.getOwnPropertyDescriptor(catalog, "__proto__")?.value).toEqual({ contextWindow: 1000 })
131+
expect(catalog?.["vendor/model"]).toEqual({ contextWindow: 2000 })
126132
})
127133
})

‎webview-ui/src/components/ui/hooks/__tests__/useSelectedModel.spec.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1927,6 +1927,21 @@ describe("useSelectedModel", () => {
19271927
expect(result.current.info).toEqual(friendliModels[friendliDefaultModelId])
19281928
})
19291929

1930+
it("should use fetched metadata for the default model when the model ID is empty", () => {
1931+
const info = { maxTokens: 8192, contextWindow: 123_456, supportsPromptCache: false }
1932+
mockUseRouterModels.mockReturnValue(
1933+
createRouterModelsResult({ friendli: { [friendliDefaultModelId]: info } }),
1934+
)
1935+
1936+
const { result } = renderHook(
1937+
() => useSelectedModel({ apiProvider: providerIdentifiers.friendli, apiModelId: "" }),
1938+
{ wrapper: createWrapper() },
1939+
)
1940+
1941+
expect(result.current.id).toBe(friendliDefaultModelId)
1942+
expect(result.current.info).toBe(info)
1943+
})
1944+
19301945
it.each(["toString", "constructor", "__proto__", "vendor/unknown"])(
19311946
"should use sane defaults, not an inherited member, for %s missing from both catalogs",
19321947
(apiModelId) => {

0 commit comments

Comments
 (0)