Skip to content

Commit d33e40d

Browse files
zoomote[bot]roomote
andauthored
[Refactor] Reuse shared API options in provider tests (#1178)
* refactor: reuse shared API test options * chore: rerun CI --------- Co-authored-by: Roomote <roomote@roomote.dev>
1 parent 3e88d47 commit d33e40d

3 files changed

Lines changed: 133 additions & 95 deletions

File tree

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

Lines changed: 42 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import { Anthropic } from "@anthropic-ai/sdk"
1818
import OpenAI from "openai"
1919

2020
import { OpenRouterHandler } from "../openrouter"
21-
import { ApiHandlerOptions } from "../../../shared/api"
2221
import { Package } from "../../../shared/package"
22+
import { makeApiHandlerOptions } from "../../../test-utils/api"
2323
import { asyncStreamFrom, collectStream } from "../../../test-utils/stream"
2424

2525
vitest.mock("openai")
@@ -102,10 +102,10 @@ vitest.mock("../fetchers/modelCache", () => ({
102102
}))
103103

104104
describe("OpenRouterHandler", () => {
105-
const mockOptions: ApiHandlerOptions = {
105+
const mockOptions = makeApiHandlerOptions({
106106
openRouterApiKey: "test-key",
107107
openRouterModelId: "anthropic/claude-sonnet-4",
108-
}
108+
})
109109

110110
beforeEach(() => vitest.clearAllMocks())
111111

@@ -147,12 +147,14 @@ describe("OpenRouterHandler", () => {
147147
})
148148

149149
it("honors custom maxTokens for thinking models", async () => {
150-
const handler = new OpenRouterHandler({
151-
openRouterApiKey: "test-key",
152-
openRouterModelId: "anthropic/claude-3.7-sonnet:thinking",
153-
modelMaxTokens: 32_768,
154-
modelMaxThinkingTokens: 16_384,
155-
})
150+
const handler = new OpenRouterHandler(
151+
makeApiHandlerOptions({
152+
openRouterApiKey: "test-key",
153+
openRouterModelId: "anthropic/claude-3.7-sonnet:thinking",
154+
modelMaxTokens: 32_768,
155+
modelMaxThinkingTokens: 16_384,
156+
}),
157+
)
156158

157159
const result = await handler.fetchModel()
158160
// With the new clamping logic, 128000 tokens (64% of 200000 context window)
@@ -163,11 +165,13 @@ describe("OpenRouterHandler", () => {
163165
})
164166

165167
it("does not honor custom maxTokens for non-thinking models", async () => {
166-
const handler = new OpenRouterHandler({
167-
...mockOptions,
168-
modelMaxTokens: 32_768,
169-
modelMaxThinkingTokens: 16_384,
170-
})
168+
const handler = new OpenRouterHandler(
169+
makeApiHandlerOptions({
170+
...mockOptions,
171+
modelMaxTokens: 32_768,
172+
modelMaxThinkingTokens: 16_384,
173+
}),
174+
)
171175

172176
const result = await handler.fetchModel()
173177
expect(result.maxTokens).toBe(8192)
@@ -176,10 +180,12 @@ describe("OpenRouterHandler", () => {
176180
})
177181

178182
it("adds excludedTools and includedTools for OpenAI models", async () => {
179-
const handler = new OpenRouterHandler({
180-
openRouterApiKey: "test-key",
181-
openRouterModelId: "openai/gpt-4o",
182-
})
183+
const handler = new OpenRouterHandler(
184+
makeApiHandlerOptions({
185+
openRouterApiKey: "test-key",
186+
openRouterModelId: "openai/gpt-4o",
187+
}),
188+
)
183189

184190
const result = await handler.fetchModel()
185191
expect(result.id).toBe("openai/gpt-4o")
@@ -189,10 +195,12 @@ describe("OpenRouterHandler", () => {
189195
})
190196

191197
it("merges excludedTools and includedTools with existing values for OpenAI models", async () => {
192-
const handler = new OpenRouterHandler({
193-
openRouterApiKey: "test-key",
194-
openRouterModelId: "openai/o1",
195-
})
198+
const handler = new OpenRouterHandler(
199+
makeApiHandlerOptions({
200+
openRouterApiKey: "test-key",
201+
openRouterModelId: "openai/o1",
202+
}),
203+
)
196204

197205
const result = await handler.fetchModel()
198206
expect(result.id).toBe("openai/o1")
@@ -208,10 +216,12 @@ describe("OpenRouterHandler", () => {
208216
})
209217

210218
it("does not add excludedTools or includedTools for non-OpenAI models", async () => {
211-
const handler = new OpenRouterHandler({
212-
openRouterApiKey: "test-key",
213-
openRouterModelId: "anthropic/claude-sonnet-4",
214-
})
219+
const handler = new OpenRouterHandler(
220+
makeApiHandlerOptions({
221+
openRouterApiKey: "test-key",
222+
openRouterModelId: "anthropic/claude-sonnet-4",
223+
}),
224+
)
215225

216226
const result = await handler.fetchModel()
217227
expect(result.id).toBe("anthropic/claude-sonnet-4")
@@ -281,10 +291,12 @@ describe("OpenRouterHandler", () => {
281291
})
282292

283293
it("adds cache control for supported models", async () => {
284-
const handler = new OpenRouterHandler({
285-
...mockOptions,
286-
openRouterModelId: "anthropic/claude-3.5-sonnet",
287-
})
294+
const handler = new OpenRouterHandler(
295+
makeApiHandlerOptions({
296+
...mockOptions,
297+
openRouterModelId: "anthropic/claude-3.5-sonnet",
298+
}),
299+
)
288300

289301
const mockStream = asyncStreamFrom([
290302
{

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

Lines changed: 45 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import { Anthropic } from "@anthropic-ai/sdk"
1010
import OpenAI from "openai"
1111

1212
import { RequestyHandler } from "../requesty"
13-
import { ApiHandlerOptions } from "../../../shared/api"
1413
import { Package } from "../../../shared/package"
1514
import { ApiHandlerCreateMessageMetadata } from "../../index"
15+
import { makeApiHandlerOptions } from "../../../test-utils/api"
1616
import { asyncStreamFrom, collectStream } from "../../../test-utils/stream"
1717

1818
const mockCreate = vitest.fn()
@@ -98,10 +98,10 @@ vitest.mock("../fetchers/modelCache", () => ({
9898
}))
9999

100100
describe("RequestyHandler", () => {
101-
const mockOptions: ApiHandlerOptions = {
101+
const mockOptions = makeApiHandlerOptions({
102102
requestyApiKey: "test-key",
103103
requestyModelId: "coding/claude-4-sonnet",
104-
}
104+
})
105105

106106
beforeEach(() => vitest.clearAllMocks())
107107

@@ -244,12 +244,14 @@ describe("RequestyHandler", () => {
244244
})
245245

246246
it("uses adaptive thinking for Claude Fable 5 when reasoning is enabled", async () => {
247-
const handler = new RequestyHandler({
248-
requestyApiKey: "test-key",
249-
requestyModelId: "anthropic/claude-fable-5",
250-
enableReasoningEffort: true,
251-
modelMaxTokens: 32768,
252-
})
247+
const handler = new RequestyHandler(
248+
makeApiHandlerOptions({
249+
requestyApiKey: "test-key",
250+
requestyModelId: "anthropic/claude-fable-5",
251+
enableReasoningEffort: true,
252+
modelMaxTokens: 32768,
253+
}),
254+
)
253255

254256
const mockStream = asyncStreamFrom([
255257
{
@@ -275,12 +277,14 @@ describe("RequestyHandler", () => {
275277
})
276278

277279
it("uses adaptive thinking for Claude Sonnet 5 when reasoning is enabled", async () => {
278-
const handler = new RequestyHandler({
279-
requestyApiKey: "test-key",
280-
requestyModelId: "anthropic/claude-sonnet-5",
281-
enableReasoningEffort: true,
282-
modelMaxTokens: 32768,
283-
})
280+
const handler = new RequestyHandler(
281+
makeApiHandlerOptions({
282+
requestyApiKey: "test-key",
283+
requestyModelId: "anthropic/claude-sonnet-5",
284+
enableReasoningEffort: true,
285+
modelMaxTokens: 32768,
286+
}),
287+
)
284288

285289
const mockStream = asyncStreamFrom([
286290
{
@@ -306,12 +310,14 @@ describe("RequestyHandler", () => {
306310
})
307311

308312
it("uses adaptive thinking for Claude Opus 5 when reasoning is enabled", async () => {
309-
const handler = new RequestyHandler({
310-
requestyApiKey: "test-key",
311-
requestyModelId: "anthropic/claude-opus-5",
312-
enableReasoningEffort: true,
313-
modelMaxTokens: 32768,
314-
})
313+
const handler = new RequestyHandler(
314+
makeApiHandlerOptions({
315+
requestyApiKey: "test-key",
316+
requestyModelId: "anthropic/claude-opus-5",
317+
enableReasoningEffort: true,
318+
modelMaxTokens: 32768,
319+
}),
320+
)
315321

316322
const mockStream = asyncStreamFrom([
317323
{
@@ -574,10 +580,12 @@ describe("RequestyHandler", () => {
574580
})
575581

576582
it("omits temperature for Claude Fable 5 in completePrompt", async () => {
577-
const handler = new RequestyHandler({
578-
requestyApiKey: "test-key",
579-
requestyModelId: "anthropic/claude-fable-5",
580-
})
583+
const handler = new RequestyHandler(
584+
makeApiHandlerOptions({
585+
requestyApiKey: "test-key",
586+
requestyModelId: "anthropic/claude-fable-5",
587+
}),
588+
)
581589
mockCreate.mockResolvedValue({ choices: [{ message: { content: "test completion" } }] })
582590

583591
await handler.completePrompt("test prompt")
@@ -591,10 +599,12 @@ describe("RequestyHandler", () => {
591599
})
592600

593601
it("omits temperature for Claude Sonnet 5 in completePrompt", async () => {
594-
const handler = new RequestyHandler({
595-
requestyApiKey: "test-key",
596-
requestyModelId: "anthropic/claude-sonnet-5",
597-
})
602+
const handler = new RequestyHandler(
603+
makeApiHandlerOptions({
604+
requestyApiKey: "test-key",
605+
requestyModelId: "anthropic/claude-sonnet-5",
606+
}),
607+
)
598608
mockCreate.mockResolvedValue({ choices: [{ message: { content: "test completion" } }] })
599609

600610
await handler.completePrompt("test prompt")
@@ -608,10 +618,12 @@ describe("RequestyHandler", () => {
608618
})
609619

610620
it("omits temperature for Claude Opus 5 in completePrompt", async () => {
611-
const handler = new RequestyHandler({
612-
requestyApiKey: "test-key",
613-
requestyModelId: "anthropic/claude-opus-5",
614-
})
621+
const handler = new RequestyHandler(
622+
makeApiHandlerOptions({
623+
requestyApiKey: "test-key",
624+
requestyModelId: "anthropic/claude-opus-5",
625+
}),
626+
)
615627
mockCreate.mockResolvedValue({ choices: [{ message: { content: "test completion" } }] })
616628

617629
await handler.completePrompt("test prompt")

0 commit comments

Comments
 (0)