Improve stub usage

Author: savannahostrowski

src/test/cloud/ui/pickers.test.ts

@@ -157,19 +157,17 @@ suite("cloud/ui/pickers", () => {
 
   suite("pickTeam", () => {
     test("auto-selects when only one team", async () => {
-      const api = mockApiService({
-        getTeams: sinon.stub().resolves([team1]),
-      })
+      const api = mockApiService()
+      api.getTeams.resolves([team1])
 
       const result = await pickTeam(api)
 
       assert.deepStrictEqual(result, team1)
     })
 
     test("shows quick pick when multiple teams", async () => {
-      const api = mockApiService({
-        getTeams: sinon.stub().resolves([team1, team2]),
-      })
+      const api = mockApiService()
+      api.getTeams.resolves([team1, team2])
 
       sinon
         .stub(ui, "showQuickPick")
@@ -191,9 +189,8 @@ suite("cloud/ui/pickers", () => {
     })
 
     test("returns null on fetch error", async () => {
-      const api = mockApiService({
-        getTeams: sinon.stub().rejects(new Error("Network error")),
-      })
+      const api = mockApiService()
+      api.getTeams.rejects(new Error("Network error"))
       const errorStub = sinon.stub(ui, "showErrorMessage")
 
       const result = await pickTeam(api)
@@ -203,9 +200,8 @@ suite("cloud/ui/pickers", () => {
     })
 
     test("returns null when user cancels", async () => {
-      const api = mockApiService({
-        getTeams: sinon.stub().resolves([team1, team2]),
-      })
+      const api = mockApiService()
+      api.getTeams.resolves([team1, team2])
 
       sinon.stub(ui, "showQuickPick").resolves(undefined)
 
@@ -217,9 +213,8 @@ suite("cloud/ui/pickers", () => {
 
   suite("pickExistingApp", () => {
     test("shows apps and returns selection", async () => {
-      const api = mockApiService({
-        getApps: sinon.stub().resolves([app1, app2]),
-      })
+      const api = mockApiService()
+      api.getApps.resolves([app1, app2])
 
       sinon
         .stub(vscode.window, "showQuickPick")
@@ -241,9 +236,8 @@ suite("cloud/ui/pickers", () => {
     })
 
     test("returns null on fetch error", async () => {
-      const api = mockApiService({
-        getApps: sinon.stub().rejects(new Error("Network error")),
-      })
+      const api = mockApiService()
+      api.getApps.rejects(new Error("Network error"))
       const errorStub = sinon.stub(ui, "showErrorMessage")
 
       const result = await pickExistingApp(api, team1)
@@ -253,9 +247,8 @@ suite("cloud/ui/pickers", () => {
     })
 
     test("returns null when user cancels", async () => {
-      const api = mockApiService({
-        getApps: sinon.stub().resolves([app1]),
-      })
+      const api = mockApiService()
+      api.getApps.resolves([app1])
 
       sinon.stub(ui, "showQuickPick").resolves(undefined)
 
@@ -268,9 +261,8 @@ suite("cloud/ui/pickers", () => {
   suite("createNewApp", () => {
     test("creates app with valid name", async () => {
       const createdApp = { id: "a3", slug: "my-app", url: "", team_id: "t1" }
-      const api = mockApiService({
-        createApp: sinon.stub().resolves(createdApp),
-      })
+      const api = mockApiService()
+      api.createApp.resolves(createdApp)
 
       sinon.stub(vscode.window, "showInputBox").resolves("my-app")
 
@@ -316,9 +308,8 @@ suite("cloud/ui/pickers", () => {
     })
 
     test("returns null on API error", async () => {
-      const api = mockApiService({
-        createApp: sinon.stub().rejects(new Error("Already exists")),
-      })
+      const api = mockApiService()
+      api.createApp.rejects(new Error("Already exists"))
 
       sinon.stub(vscode.window, "showInputBox").resolves("my-app")
       const errorStub = sinon.stub(ui, "showErrorMessage")

src/test/testUtils.ts

@@ -2,7 +2,7 @@ import { existsSync, readFileSync } from "node:fs"
 import { dirname, join } from "node:path"
 import sinon from "sinon"
 import * as vscode from "vscode"
-import type { ApiService } from "../cloud/api"
+import { ApiService } from "../cloud/api"
 import type { ConfigService } from "../cloud/config"
 import type { FileSystem } from "../core/filesystem"
 
@@ -185,30 +185,25 @@ export function mockResponse(body: unknown, ok = true, status = 200): Response {
   } as unknown as Response
 }
 
-export function mockApiService(overrides?: Partial<ApiService>) {
-  return {
+export function mockApiService(
+  overrides: Partial<sinon.SinonStubbedInstance<ApiService>> = {},
+): sinon.SinonStubbedInstance<ApiService> {
+  const stub = sinon.createStubInstance(ApiService)
+  Object.assign(stub, {
     baseUrl: "https://api.fastapicloud.com/api/v1",
     dashboardUrl: "https://dashboard.fastapicloud.com",
-    getDashboardUrl: sinon
-      .stub()
-      .callsFake(
-        (teamSlug: string, appSlug: string) =>
-          `https://dashboard.fastapicloud.com/${teamSlug}/apps/${appSlug}/general`,
-      ),
-    getUser: sinon.stub().resolves(null),
-    getTeams: sinon.stub().resolves([]),
-    getApps: sinon.stub().resolves([]),
-    createApp: sinon.stub(),
-    getApp: sinon.stub(),
-    getTeam: sinon.stub(),
-    createDeployment: sinon.stub(),
-    getUploadUrl: sinon.stub(),
-    completeUpload: sinon.stub(),
-    getDeployment: sinon.stub(),
-    requestDeviceCode: sinon.stub(),
-    pollDeviceToken: sinon.stub(),
-    ...overrides,
-  } as unknown as sinon.SinonStubbedInstance<ApiService>
+  })
+
+  stub.getDashboardUrl.callsFake((teamSlug: string, appSlug: string) => {
+    return `https://dashboard.fastapicloud.com/${teamSlug}/apps/${appSlug}/general`
+  })
+
+  stub.getUser.resolves(null)
+  stub.getTeams.resolves([])
+  stub.getApps.resolves([])
+
+  Object.assign(stub, overrides)
+  return stub
 }
 
 export function mockConfigService() {