More test cleanup

Author: savannahostrowski

src/test/cloud/api.test.ts

@@ -32,17 +32,15 @@ suite("cloud/api", () => {
 
       const result = await ApiService.requestDeviceCode("test-client")
 
-      assert.strictEqual(result.device_code, "dc_123")
-      assert.strictEqual(result.user_code, "UC-456")
-      assert.strictEqual(result.verification_uri, "https://example.com/verify")
-      assert.strictEqual(
-        result.verification_uri_complete,
-        "https://example.com/verify?code=UC-456",
-      )
-      assert.strictEqual(result.expires_in, 900)
-      assert.strictEqual(result.interval, 5)
+      assert.deepStrictEqual(result, {
+        device_code: "dc_123",
+        user_code: "UC-456",
+        verification_uri: "https://example.com/verify",
+        verification_uri_complete: "https://example.com/verify?code=UC-456",
+        expires_in: 900,
+        interval: 5,
+      })
 
-      // Verify fetch was called with correct params
       const [url, options] = fetchStub.firstCall.args
       assert.strictEqual(url, `${BASE_URL}/login/device/authorization`)
       assert.strictEqual(options?.method, "POST")
@@ -88,6 +86,39 @@ suite("cloud/api", () => {
     })
   })
 
+  suite("getUser", () => {
+    test("returns user on success", async () => {
+      sinon
+        .stub(globalThis, "fetch")
+        .resolves(
+          mockResponse({ email: "test@example.com", full_name: "Test User" }),
+        )
+
+      const result = await ApiService.getUser("test_token")
+
+      assert.deepStrictEqual(result, {
+        email: "test@example.com",
+        full_name: "Test User",
+      })
+    })
+
+    test("returns null on non-ok response", async () => {
+      sinon.stub(globalThis, "fetch").resolves(mockResponse({}, false, 401))
+
+      const result = await ApiService.getUser("bad_token")
+
+      assert.strictEqual(result, null)
+    })
+
+    test("returns null on network error", async () => {
+      sinon.stub(globalThis, "fetch").rejects(new Error("fetch failed"))
+
+      const result = await ApiService.getUser("test_token")
+
+      assert.strictEqual(result, null)
+    })
+  })
+
   suite("pollDeviceToken", () => {
     test("returns token on success", async () => {
       sinon
@@ -113,10 +144,9 @@ suite("cloud/api", () => {
       const resultPromise = ApiService.pollDeviceToken(
         "test-client",
         "dc_123",
-        100, // short interval for test
+        100,
       )
 
-      // Advance past the polling interval
       await clock.tickAsync(150)
 
       const result = await resultPromise

src/test/cloud/auth.test.ts

@@ -2,7 +2,7 @@ import * as assert from "node:assert"
 import sinon from "sinon"
 import * as vscode from "vscode"
 import { CloudAuthenticationProvider, isTokenExpired } from "../../cloud/auth"
-import { mockResponse } from "../testUtils"
+import { mockResponse, stubFs } from "../testUtils"
 
 function createJwtToken(payload: Record<string, unknown>): string {
   const header = { alg: "HS256", typ: "JWT" }
@@ -24,33 +24,6 @@ function expiredToken(): string {
   return createJwtToken({ exp: Math.floor(Date.now() / 1000) - 3600 })
 }
 
-function stubFs() {
-  const original = vscode.workspace.fs
-  const fake = {
-    readFile: sinon.stub(),
-    writeFile: sinon.stub(),
-    delete: sinon.stub(),
-    createDirectory: sinon.stub(),
-  } as unknown as typeof vscode.workspace.fs & {
-    readFile: sinon.SinonStub
-    writeFile: sinon.SinonStub
-    delete: sinon.SinonStub
-    createDirectory: sinon.SinonStub
-  }
-  Object.defineProperty(vscode.workspace, "fs", {
-    value: fake,
-    configurable: true,
-  })
-  return {
-    fake,
-    restore: () =>
-      Object.defineProperty(vscode.workspace, "fs", {
-        value: original,
-        configurable: true,
-      }),
-  }
-}
-
 function createMockContext(): vscode.ExtensionContext {
   const secrets: Record<string, string> = {}
   return {

src/test/cloud/config.test.ts

@@ -2,33 +2,7 @@ import * as assert from "node:assert"
 import sinon from "sinon"
 import * as vscode from "vscode"
 import { ConfigService } from "../../cloud/config"
-
-function stubFs() {
-  const original = vscode.workspace.fs
-  const fake = {
-    readFile: sinon.stub(),
-    writeFile: sinon.stub(),
-    delete: sinon.stub(),
-    createDirectory: sinon.stub(),
-  } as unknown as typeof vscode.workspace.fs & {
-    readFile: sinon.SinonStub
-    writeFile: sinon.SinonStub
-    delete: sinon.SinonStub
-    createDirectory: sinon.SinonStub
-  }
-  Object.defineProperty(vscode.workspace, "fs", {
-    value: fake,
-    configurable: true,
-  })
-  return {
-    fake,
-    restore: () =>
-      Object.defineProperty(vscode.workspace, "fs", {
-        value: original,
-        configurable: true,
-      }),
-  }
-}
+import { stubFs } from "../testUtils"
 
 suite("cloud/config", () => {
   let fsStub: ReturnType<typeof stubFs>

src/test/testUtils.ts

@@ -1,5 +1,7 @@
 import { existsSync, readFileSync } from "node:fs"
 import { dirname, join } from "node:path"
+import sinon from "sinon"
+import * as vscode from "vscode"
 import type { FileSystem } from "../core/filesystem"
 
 declare const __DIST_ROOT__: string
@@ -113,6 +115,33 @@ export const nodeFileSystem: FileSystem = {
 
 // Cloud helpers
 
+export function stubFs() {
+  const original = vscode.workspace.fs
+  const fake = {
+    readFile: sinon.stub(),
+    writeFile: sinon.stub(),
+    delete: sinon.stub(),
+    createDirectory: sinon.stub(),
+  } as unknown as typeof vscode.workspace.fs & {
+    readFile: sinon.SinonStub
+    writeFile: sinon.SinonStub
+    delete: sinon.SinonStub
+    createDirectory: sinon.SinonStub
+  }
+  Object.defineProperty(vscode.workspace, "fs", {
+    value: fake,
+    configurable: true,
+  })
+  return {
+    fake,
+    restore: () =>
+      Object.defineProperty(vscode.workspace, "fs", {
+        value: original,
+        configurable: true,
+      }),
+  }
+}
+
 export function mockResponse(body: unknown, ok = true, status = 200): Response {
   return {
     ok,