LLM/opencode
1
0
Fork 0
mirror of https://github.com/anomalyco/opencode.git synced 2026-05-13 23:52:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: simplify Effect migration follow-ups (#27136)

Browse Source
This commit is contained in:
Kit Langton
2026-05-12 16:00:54 -04:00
committed by GitHub
parent e0d0fe1ff7
commit 3f74abc6cd
3 changed files with 31 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/opencode/test/fixture/fixture.ts
View File

@@ -135,7 +135,7 @@ export function tmpdirScoped(options?: { git?: boolean; config?: Partial<Config.
yield* git("config", "commit.gpgsign", "false")
yield* git("config", "user.email", "test@opencode.test")
yield* git("config", "user.name", "Test")
yield* git("commit", "--allow-empty", "-m", "root commit")
yield* git("commit", "--allow-empty", "-m", `root commit ${dir}`)
}
if (options?.config) {

69
packages/opencode/test/project/project.test.ts
View File

@@ -28,19 +28,6 @@ function run<A>(fn: (svc: Project.Interface) => Effect.Effect<A>) {
})
}
function gitTmpdir() {
return Effect.gen(function* () {
const tmp = yield* tmpdirScoped()
yield* Effect.promise(() => $`git init`.cwd(tmp).quiet())
yield* Effect.promise(() => $`git config core.fsmonitor false`.cwd(tmp).quiet())
yield* Effect.promise(() => $`git config commit.gpgsign false`.cwd(tmp).quiet())
yield* Effect.promise(() => $`git config user.email "test@opencode.test"`.cwd(tmp).quiet())
yield* Effect.promise(() => $`git config user.name "Test"`.cwd(tmp).quiet())
yield* Effect.promise(() => $`git commit --allow-empty -m ${`root commit ${tmp}`}`.cwd(tmp).quiet())
return tmp
})
}
/**
* Creates a mock ChildProcessSpawner layer that intercepts git subcommands
* matching `failArg` and returns exit code 128, while delegating everything
@@ -108,7 +95,7 @@ describe("Project.fromDirectory", () => {
it.live("should handle git repository with commits", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project } = yield* run((svc) => svc.fromDirectory(tmp))
@@ -132,7 +119,7 @@ describe("Project.fromDirectory", () => {
it.live("derives stable project ID from root commit", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project: a } = yield* run((svc) => svc.fromDirectory(tmp))
const { project: b } = yield* run((svc) => svc.fromDirectory(tmp))
expect(b.id).toBe(a.id)
@@ -156,7 +143,7 @@ describe("Project.fromDirectory git failure paths", () => {
failureIt("--show-toplevel").live("handles show-toplevel failure gracefully", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project, sandbox } = yield* run((svc) => svc.fromDirectory(tmp))
expect(project.worktree).toBe(tmp)
@@ -166,7 +153,7 @@ describe("Project.fromDirectory git failure paths", () => {
failureIt("--git-common-dir").live("handles git-common-dir failure gracefully", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project, sandbox } = yield* run((svc) => svc.fromDirectory(tmp))
expect(project.worktree).toBe(tmp)
@@ -178,7 +165,7 @@ describe("Project.fromDirectory git failure paths", () => {
describe("Project.fromDirectory with worktrees", () => {
it.live("should set worktree to root when called from root", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project, sandbox } = yield* run((svc) => svc.fromDirectory(tmp))
@@ -190,7 +177,7 @@ describe("Project.fromDirectory with worktrees", () => {
it.live("should set worktree to root when called from a worktree", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const worktreePath = path.join(tmp, "..", path.basename(tmp) + "-worktree")
yield* Effect.addFinalizer(() =>
@@ -214,7 +201,7 @@ describe("Project.fromDirectory with worktrees", () => {
it.live("worktree should share project ID with main repo", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project: main } = yield* run((svc) => svc.fromDirectory(tmp))
@@ -242,7 +229,7 @@ describe("Project.fromDirectory with worktrees", () => {
it.live("separate clones of the same repo should share project ID", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
// Create a bare remote, push, then clone into a second directory
const bare = tmp + "-bare"
@@ -262,7 +249,7 @@ describe("Project.fromDirectory with worktrees", () => {
it.live("should accumulate multiple worktrees in sandboxes", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const worktree1 = path.join(tmp, "..", path.basename(tmp) + "-wt1")
const worktree2 = path.join(tmp, "..", path.basename(tmp) + "-wt2")
@@ -299,7 +286,7 @@ describe("Project.fromDirectory with worktrees", () => {
describe("Project.discover", () => {
it.live("should discover favicon.png in root", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project } = yield* run((svc) => svc.fromDirectory(tmp))
const pngData = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a])
@@ -318,7 +305,7 @@ describe("Project.discover", () => {
it.live("should not discover non-image files", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project } = yield* run((svc) => svc.fromDirectory(tmp))
yield* Effect.promise(() => Bun.write(path.join(tmp, "favicon.txt"), "not an image"))
@@ -333,7 +320,7 @@ describe("Project.discover", () => {
it.live("should not discover favicon when override is set", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project } = yield* run((svc) => svc.fromDirectory(tmp))
yield* run((svc) =>
@@ -362,7 +349,7 @@ describe("Project.discover", () => {
describe("Project.update", () => {
it.live("should update name", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project } = yield* run((svc) => svc.fromDirectory(tmp))
const updated = yield* run((svc) =>
@@ -381,7 +368,7 @@ describe("Project.update", () => {
it.live("should update icon url", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project } = yield* run((svc) => svc.fromDirectory(tmp))
const updated = yield* run((svc) =>
@@ -400,7 +387,7 @@ describe("Project.update", () => {
it.live("should update icon color", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project } = yield* run((svc) => svc.fromDirectory(tmp))
const updated = yield* run((svc) =>
@@ -419,7 +406,7 @@ describe("Project.update", () => {
it.live("should update icon override", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project } = yield* run((svc) => svc.fromDirectory(tmp))
const updated = yield* run((svc) =>
@@ -438,7 +425,7 @@ describe("Project.update", () => {
it.live("should update commands", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project } = yield* run((svc) => svc.fromDirectory(tmp))
const updated = yield* run((svc) =>
@@ -475,7 +462,7 @@ describe("Project.update", () => {
it.live("should emit GlobalBus event on update", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project } = yield* run((svc) => svc.fromDirectory(tmp))
let eventPayload: any = null
@@ -495,7 +482,7 @@ describe("Project.update", () => {
it.live("should update multiple fields at once", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project } = yield* run((svc) => svc.fromDirectory(tmp))
const updated = yield* run((svc) =>
@@ -519,7 +506,7 @@ describe("Project.update", () => {
describe("Project.list and Project.get", () => {
it.live("list returns all projects", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project } = yield* run((svc) => svc.fromDirectory(tmp))
const all = Project.list()
@@ -530,7 +517,7 @@ describe("Project.list and Project.get", () => {
it.live("get returns project by id", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project } = yield* run((svc) => svc.fromDirectory(tmp))
const found = Project.get(project.id)
@@ -548,7 +535,7 @@ describe("Project.list and Project.get", () => {
describe("Project.setInitialized", () => {
it.live("sets time_initialized on project", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project } = yield* run((svc) => svc.fromDirectory(tmp))
expect(project.time.initialized).toBeUndefined()
@@ -564,7 +551,7 @@ describe("Project.setInitialized", () => {
describe("Project.addSandbox and Project.removeSandbox", () => {
it.live("addSandbox adds directory and removeSandbox removes it", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project } = yield* run((svc) => svc.fromDirectory(tmp))
const sandboxDir = path.join(tmp, "sandbox-test")
@@ -582,7 +569,7 @@ describe("Project.addSandbox and Project.removeSandbox", () => {
it.live("addSandbox emits GlobalBus event", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const { project } = yield* run((svc) => svc.fromDirectory(tmp))
const sandboxDir = path.join(tmp, "sandbox-event")
@@ -601,7 +588,7 @@ describe("Project.addSandbox and Project.removeSandbox", () => {
describe("Project.fromDirectory with bare repos", () => {
it.live("worktree from bare repo should cache in bare repo, not parent", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const parentDir = path.dirname(tmp)
const barePath = path.join(parentDir, `bare-${Date.now()}.git`)
@@ -628,8 +615,8 @@ describe("Project.fromDirectory with bare repos", () => {
it.live("different bare repos under same parent should not share project ID", () =>
Effect.gen(function* () {
const tmp1 = yield* gitTmpdir()
const tmp2 = yield* gitTmpdir()
const tmp1 = yield* tmpdirScoped({ git: true })
const tmp2 = yield* tmpdirScoped({ git: true })
const parentDir = path.dirname(tmp1)
const bareA = path.join(parentDir, `bare-a-${Date.now()}.git`)
@@ -664,7 +651,7 @@ describe("Project.fromDirectory with bare repos", () => {
it.live("bare repo without .git suffix is still detected via core.bare", () =>
Effect.gen(function* () {
const tmp = yield* gitTmpdir()
const tmp = yield* tmpdirScoped({ git: true })
const parentDir = path.dirname(tmp)
const barePath = path.join(parentDir, `bare-no-suffix-${Date.now()}`)

3
packages/opencode/test/question/question.test.ts
View File

@@ -397,7 +397,8 @@ it.live("pending question rejects on instance dispose", () =>
}).pipe(provideInstance(dir), Effect.forkScoped)
expect(yield* waitForPending(1).pipe(provideInstance(dir))).toHaveLength(1)
yield* Effect.promise(() => InstanceRuntime.disposeInstance(Instance.current)).pipe(provideInstance(dir))
const ctx = yield* Effect.sync(() => Instance.current).pipe(provideInstance(dir))
yield* Effect.promise(() => InstanceRuntime.disposeInstance(ctx))
const exit = yield* Fiber.await(fiber)
expect(Exit.isFailure(exit)).toBe(true)