Mohamed Boudra
7e5d7f7c67
The local/worktree choice was unstored component state and reset on every remount of the New Workspace screen (e.g. after creating a workspace). Persist it in the create-form preferences (FormPreferences.isolation). Also rename the app-layer "backing" to "isolation" to match its UI label. Isolation is the create-time intent; it stays distinct from workspaceKind, the git-derived persisted property, and the wire's source.kind.
97 lines
3.7 KiB
TypeScript
97 lines
3.7 KiB
TypeScript
import { expect, test } from "./fixtures";
|
|
import { gotoAppShell } from "./helpers/app";
|
|
import {
|
|
archiveLocalWorkspaceFromDaemon,
|
|
archiveWorkspaceFromDaemon,
|
|
assertNewWorkspaceSidebarAndHeader,
|
|
connectNewWorkspaceDaemonClient,
|
|
expectWorkspaceIsolationSelected,
|
|
openNewWorkspaceComposer,
|
|
openProjectViaDaemon,
|
|
openStartingRefPicker,
|
|
selectBranchInPicker,
|
|
selectWorkspaceIsolation,
|
|
} from "./helpers/new-workspace";
|
|
import { createTempGitRepo } from "./helpers/workspace";
|
|
import { getServerId } from "./helpers/server-id";
|
|
import { waitForSidebarHydration } from "./helpers/workspace-ui";
|
|
|
|
// Regression for "the local / worktree selection in the new workspace is not
|
|
// remembered." The isolation choice persists in the create-form preferences
|
|
// (FormPreferences.isolation), so it must survive the create→reopen remount:
|
|
// creating a worktree workspace navigates away from /new and unmounts it, and
|
|
// reopening New Workspace has to still show "New worktree".
|
|
test.describe("New workspace isolation memory", () => {
|
|
let client: Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>;
|
|
const localWorkspaceIds = new Set<string>();
|
|
const createdWorktreeDirectories = new Set<string>();
|
|
|
|
test.describe.configure({ timeout: 240_000 });
|
|
|
|
test.beforeEach(async () => {
|
|
client = await connectNewWorkspaceDaemonClient();
|
|
});
|
|
|
|
test.afterEach(async () => {
|
|
if (client) {
|
|
for (const workspaceDirectory of createdWorktreeDirectories) {
|
|
await archiveWorkspaceFromDaemon(client, workspaceDirectory).catch(() => undefined);
|
|
}
|
|
for (const workspaceId of localWorkspaceIds) {
|
|
await archiveLocalWorkspaceFromDaemon(client, workspaceId).catch(() => undefined);
|
|
}
|
|
}
|
|
createdWorktreeDirectories.clear();
|
|
localWorkspaceIds.clear();
|
|
await client?.close().catch(() => undefined);
|
|
});
|
|
|
|
test("remembers the worktree isolation choice after creating a workspace", async ({ page }) => {
|
|
const serverId = getServerId();
|
|
const tempRepo = await createTempGitRepo("isolation-memory-", { branches: ["main", "dev"] });
|
|
|
|
try {
|
|
const openedProject = await openProjectViaDaemon(client, tempRepo.path);
|
|
localWorkspaceIds.add(openedProject.workspaceId);
|
|
|
|
await gotoAppShell(page);
|
|
await waitForSidebarHydration(page);
|
|
|
|
// First visit: the screen opens on Local, switch it to New worktree and create.
|
|
await openNewWorkspaceComposer(page, {
|
|
projectKey: openedProject.projectKey,
|
|
projectDisplayName: openedProject.projectDisplayName,
|
|
});
|
|
await expectWorkspaceIsolationSelected(page, "local");
|
|
await selectWorkspaceIsolation(page, "worktree");
|
|
await expectWorkspaceIsolationSelected(page, "worktree");
|
|
|
|
await openStartingRefPicker(page);
|
|
await selectBranchInPicker(page, "dev");
|
|
|
|
const createButton = page
|
|
.getByTestId("message-input-root")
|
|
.getByRole("button", { name: "Create" });
|
|
await expect(createButton).toBeVisible({ timeout: 30_000 });
|
|
await createButton.click();
|
|
|
|
const createdWorkspace = await assertNewWorkspaceSidebarAndHeader(page, {
|
|
serverId,
|
|
client,
|
|
previousWorkspaceId: openedProject.workspaceId,
|
|
projectDisplayName: openedProject.projectDisplayName,
|
|
});
|
|
createdWorktreeDirectories.add(createdWorkspace.workspaceDirectory);
|
|
|
|
// Second visit (fresh mount of /new): the worktree choice must stick.
|
|
await openNewWorkspaceComposer(page, {
|
|
projectKey: openedProject.projectKey,
|
|
projectDisplayName: openedProject.projectDisplayName,
|
|
});
|
|
await expectWorkspaceIsolationSelected(page, "worktree");
|
|
} finally {
|
|
await tempRepo.cleanup();
|
|
}
|
|
});
|
|
});
|