chore: fix test

This commit is contained in:
Adam 2026-03-06 15:27:49 -06:00
parent 7da24ebf5d
commit 7a071eff5c
No known key found for this signature in database
GPG Key ID: 9CB48779AF150E75
2 changed files with 22 additions and 24 deletions

View File

@ -50,7 +50,7 @@ const cacheDir = path.join(dir, "cache", "opencode")
await fs.mkdir(cacheDir, { recursive: true })
await fs.writeFile(path.join(cacheDir, "version"), "14")
// Clear provider env vars to ensure clean test state
// Clear provider and server auth env vars to ensure clean test state
delete process.env["ANTHROPIC_API_KEY"]
delete process.env["OPENAI_API_KEY"]
delete process.env["GOOGLE_API_KEY"]
@ -70,6 +70,8 @@ delete process.env["DEEPSEEK_API_KEY"]
delete process.env["FIREWORKS_API_KEY"]
delete process.env["CEREBRAS_API_KEY"]
delete process.env["SAMBANOVA_API_KEY"]
delete process.env["OPENCODE_SERVER_PASSWORD"]
delete process.env["OPENCODE_SERVER_USERNAME"]
// Now safe to import from src/
const { Log } = await import("../src/util/log")

View File

@ -73,8 +73,8 @@ describe("project.initGit endpoint", () => {
}
})
test("does not reload again when the project is already git", async () => {
await using tmp = await tmpdir()
test("does not reload when the project is already git", async () => {
await using tmp = await tmpdir({ git: true })
const app = Server.App()
const seen: { directory?: string; payload: { type: string } }[] = []
const fn = (evt: { directory?: string; payload: { type: string } }) => {
@ -85,36 +85,32 @@ describe("project.initGit endpoint", () => {
GlobalBus.on("event", fn)
try {
const first = await app.request("/project/git/init", {
const init = await app.request("/project/git/init", {
method: "POST",
headers: {
"x-opencode-directory": tmp.path,
},
})
expect(first.status).toBe(200)
const before = seen.filter(
(evt) => evt.directory === tmp.path && evt.payload.type === "server.instance.disposed",
).length
expect(reloadSpy).toHaveBeenCalledTimes(1)
const second = await app.request("/project/git/init", {
method: "POST",
headers: {
"x-opencode-directory": tmp.path,
},
})
expect(second.status).toBe(200)
expect(await second.json()).toMatchObject({
id: "global",
expect(init.status).toBe(200)
expect(await init.json()).toMatchObject({
vcs: "git",
worktree: tmp.path,
})
expect(
seen.filter((evt) => evt.directory === tmp.path && evt.payload.type === "server.instance.disposed").length,
).toBe(0)
expect(reloadSpy).toHaveBeenCalledTimes(0)
const after = seen.filter(
(evt) => evt.directory === tmp.path && evt.payload.type === "server.instance.disposed",
).length
expect(after).toBe(before)
expect(reloadSpy).toHaveBeenCalledTimes(1)
const current = await app.request("/project/current", {
headers: {
"x-opencode-directory": tmp.path,
},
})
expect(current.status).toBe(200)
expect(await current.json()).toMatchObject({
vcs: "git",
worktree: tmp.path,
})
} finally {
reloadSpy.mockRestore()
GlobalBus.off("event", fn)