Fix workspace diff default base refs

This commit is contained in:
Dotta committed 2026-05-19 13:54:54 -05:00
1 parent 858fd027ec
commit d93c771c58
4 files changed
+230 -20

No files matched your search

@@ -227,6 +227,115 @@ describe("workspace diff plugin", () => {
});
});
it("uses the primary project workspace default ref when execution workspace has no workspace link", async () => {
const root = await createGitWorkspace();
await git(root, ["checkout", "-b", "feature"]);
await fs.writeFile(path.join(root, "src/app.ts"), "export const value = 5;\n");
await git(root, ["add", "src/app.ts"]);
await git(root, ["commit", "-m", "feature change"]);
const harness = createTestHarness({ manifest });
harness.seed({
executionWorkspaces: [{
id: "workspace-1",
companyId: "company-1",
projectId: "project-1",
projectWorkspaceId: null,
path: root,
cwd: root,
repoUrl: null,
baseRef: null,
branchName: "feature",
providerType: "git_worktree",
providerMetadata: null,
}],
});
harness.ctx.projects.listWorkspaces = async (projectId, companyId) => {
expect(projectId).toBe("project-1");
expect(companyId).toBe("company-1");
return [{
id: "project-workspace-1",
projectId: "project-1",
name: "Primary",
path: root,
repoUrl: null,
repoRef: "feature",
defaultRef: "main",
isPrimary: true,
createdAt: new Date().toISOString(),
updatedAt: new Date().toISOString(),
}];
};
await plugin.definition.setup(harness.ctx);
const result = await harness.getData("workspace-diff", {
workspaceId: "workspace-1",
companyId: "company-1",
projectId: "project-1",
view: "head",
baseRef: null,
includeUntracked: false,
});
expect(result).toMatchObject({
baseRef: "main",
defaultBaseRef: "main",
stats: { fileCount: 1 },
files: [expect.objectContaining({ path: "src/app.ts" })],
});
});
it("infers the default base ref from the execution workspace branch upstream", async () => {
const root = await createGitWorkspace();
await git(root, ["update-ref", "refs/remotes/origin/master", "HEAD"]);
await git(root, ["checkout", "-b", "feature"]);
await git(root, ["config", "branch.feature.remote", "origin"]);
await git(root, ["config", "branch.feature.merge", "refs/heads/master"]);
await fs.writeFile(path.join(root, "src/app.ts"), "export const value = 6;\n");
await git(root, ["add", "src/app.ts"]);
await git(root, ["commit", "-m", "feature change"]);
const harness = createTestHarness({ manifest });
harness.seed({
executionWorkspaces: [{
id: "workspace-1",
companyId: "company-1",
projectId: "project-1",
projectWorkspaceId: null,
path: root,
cwd: root,
repoUrl: null,
baseRef: null,
branchName: "feature",
providerType: "git_worktree",
providerMetadata: null,
}],
});
await plugin.definition.setup(harness.ctx);
await expect(harness.getData("workspace-diff", {
workspaceId: "workspace-1",
companyId: "company-1",
view: "working-tree",
includeUntracked: false,
})).resolves.toMatchObject({
baseRef: null,
defaultBaseRef: "origin/master",
stats: { fileCount: 0 },
});
await expect(harness.getData("workspace-diff", {
workspaceId: "workspace-1",
companyId: "company-1",
view: "head",
baseRef: null,
includeUntracked: false,
})).resolves.toMatchObject({
baseRef: "origin/master",
defaultBaseRef: "origin/master",
stats: { fileCount: 1 },
files: [expect.objectContaining({ path: "src/app.ts" })],
});
});
it("returns a clear bridge error when required context is missing", async () => {
const harness = createTestHarness({ manifest });
await plugin.definition.setup(harness.ctx);