mirror of
https://github.com/getpaseo/paseo.git
synced 2026-07-29 12:01:31 +00:00
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.
227 lines
8.2 KiB
TypeScript
227 lines
8.2 KiB
TypeScript
import { test, expect, type Page } from "./fixtures";
|
|
import { gotoAppShell } from "./helpers/app";
|
|
import { gotoWorkspace } from "./helpers/launcher";
|
|
import {
|
|
assertNewWorkspaceSidebarAndHeader,
|
|
connectNewWorkspaceDaemonClient,
|
|
openGlobalNewWorkspaceComposer,
|
|
selectNewWorkspaceProject,
|
|
selectWorkspaceIsolation,
|
|
submitNewWorkspaceEmpty,
|
|
} from "./helpers/new-workspace";
|
|
import { seedWorkspace, type SeededWorkspace } from "./helpers/seed-client";
|
|
import { expectExplorerEntryVisible } from "./helpers/file-explorer";
|
|
import { getServerId } from "./helpers/server-id";
|
|
import { waitForSidebarHydration } from "./helpers/workspace-ui";
|
|
|
|
// Model B reshape: a workspace is the unit, its isolation (local checkout or
|
|
// worktree) is a CHOICE at creation, and creation NEVER dedupes by
|
|
// directory. These specs drive the real creation UI (workspace-create-* test
|
|
// IDs) to prove a single directory can back any number of workspaces.
|
|
|
|
function workspaceRowTestId(workspaceId: string): string {
|
|
return `sidebar-workspace-row-${getServerId()}:${workspaceId}`;
|
|
}
|
|
|
|
// On desktop the file explorer is pinned open; on narrower layouts it must be
|
|
// toggled first. Open it either way, then select the Files tab.
|
|
async function openFilesTab(page: Page): Promise<void> {
|
|
const openButton = page.getByRole("button", { name: "Open explorer" }).first();
|
|
if (await openButton.isVisible().catch(() => false)) {
|
|
await openButton.click();
|
|
}
|
|
await page.getByTestId("explorer-tab-files").click();
|
|
await expect(page.getByTestId("file-explorer-tree-scroll")).toBeVisible({ timeout: 30_000 });
|
|
}
|
|
|
|
async function createWorkspaceViaUi(
|
|
page: Page,
|
|
input: {
|
|
project: { projectKey: string; projectDisplayName: string };
|
|
// null when the project has no git checkout: there is no Isolation control to
|
|
// touch, the isolation is implicitly local.
|
|
isolation: "local" | "worktree" | null;
|
|
previousWorkspaceId: string;
|
|
client: Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>;
|
|
},
|
|
): Promise<{ workspaceId: string; workspaceName: string; workspaceDirectory: string }> {
|
|
await openGlobalNewWorkspaceComposer(page);
|
|
await selectNewWorkspaceProject(page, input.project);
|
|
if (input.isolation !== null) {
|
|
await selectWorkspaceIsolation(page, input.isolation);
|
|
}
|
|
await submitNewWorkspaceEmpty(page);
|
|
|
|
return assertNewWorkspaceSidebarAndHeader(page, {
|
|
serverId: getServerId(),
|
|
client: input.client,
|
|
previousWorkspaceId: input.previousWorkspaceId,
|
|
projectDisplayName: input.project.projectDisplayName,
|
|
assertSidebarRow: false,
|
|
assertHeader: false,
|
|
});
|
|
}
|
|
|
|
test.describe("Workspace multiplicity creation flow", () => {
|
|
let client: Awaited<ReturnType<typeof connectNewWorkspaceDaemonClient>>;
|
|
|
|
test.describe.configure({ timeout: 240_000 });
|
|
|
|
test.beforeEach(async () => {
|
|
client = await connectNewWorkspaceDaemonClient();
|
|
});
|
|
|
|
test.afterEach(async () => {
|
|
await client?.close().catch(() => undefined);
|
|
});
|
|
|
|
test("two Local workspaces share one git checkout and both are independently selectable", async ({
|
|
page,
|
|
}) => {
|
|
const seeded: SeededWorkspace = await seedWorkspace({
|
|
repoPrefix: "multiplicity-local-git-",
|
|
});
|
|
|
|
try {
|
|
const project = {
|
|
projectKey: seeded.projectId,
|
|
projectDisplayName: seeded.projectDisplayName,
|
|
};
|
|
|
|
await gotoAppShell(page);
|
|
await waitForSidebarHydration(page);
|
|
await expect(page.getByTestId(workspaceRowTestId(seeded.workspaceId))).toBeVisible({
|
|
timeout: 30_000,
|
|
});
|
|
|
|
const second = await createWorkspaceViaUi(page, {
|
|
project,
|
|
isolation: "local",
|
|
previousWorkspaceId: seeded.workspaceId,
|
|
client,
|
|
});
|
|
|
|
// A second workspace was minted on the SAME checkout — creation did not
|
|
// dedupe the directory away.
|
|
expect(second.workspaceId).not.toBe(seeded.workspaceId);
|
|
expect(second.workspaceDirectory).toBe(seeded.workspaceDirectory);
|
|
|
|
// Both rows live under the same project and are distinct.
|
|
const firstRow = page.getByTestId(workspaceRowTestId(seeded.workspaceId));
|
|
const secondRow = page.getByTestId(workspaceRowTestId(second.workspaceId));
|
|
await expect(firstRow).toBeVisible({ timeout: 30_000 });
|
|
await expect(secondRow).toBeVisible({ timeout: 30_000 });
|
|
await expect(secondRow).toContainText(second.workspaceName);
|
|
|
|
// Selecting the second workspace shows the shared checkout's files.
|
|
await gotoWorkspace(page, second.workspaceId);
|
|
await openFilesTab(page);
|
|
await expectExplorerEntryVisible(page, "README.md");
|
|
|
|
// Selecting the first workspace shows the SAME shared directory data.
|
|
await gotoWorkspace(page, seeded.workspaceId);
|
|
await openFilesTab(page);
|
|
await expectExplorerEntryVisible(page, "README.md");
|
|
} finally {
|
|
await seeded.cleanup();
|
|
}
|
|
});
|
|
|
|
test("New worktree isolation creates a worktree-backed workspace in a distinct directory", async ({
|
|
page,
|
|
}) => {
|
|
const seeded: SeededWorkspace = await seedWorkspace({
|
|
repoPrefix: "multiplicity-worktree-",
|
|
});
|
|
|
|
try {
|
|
const project = {
|
|
projectKey: seeded.projectId,
|
|
projectDisplayName: seeded.projectDisplayName,
|
|
};
|
|
|
|
await gotoAppShell(page);
|
|
await waitForSidebarHydration(page);
|
|
await expect(page.getByTestId(workspaceRowTestId(seeded.workspaceId))).toBeVisible({
|
|
timeout: 30_000,
|
|
});
|
|
|
|
const worktree = await createWorkspaceViaUi(page, {
|
|
project,
|
|
isolation: "worktree",
|
|
previousWorkspaceId: seeded.workspaceId,
|
|
client,
|
|
});
|
|
|
|
// The worktree row appears, pointing at a directory distinct from the
|
|
// local checkout.
|
|
const worktreeRow = page.getByTestId(workspaceRowTestId(worktree.workspaceId));
|
|
await expect(worktreeRow).toBeVisible({ timeout: 30_000 });
|
|
expect(worktree.workspaceId).not.toBe(seeded.workspaceId);
|
|
expect(worktree.workspaceDirectory).not.toBe(seeded.workspaceDirectory);
|
|
|
|
// The daemon descriptor confirms the worktree kind (○ row).
|
|
const descriptor = (await client.fetchWorkspaces()).entries.find(
|
|
(entry) => entry.id === worktree.workspaceId,
|
|
);
|
|
expect(descriptor?.workspaceKind).toBe("worktree");
|
|
|
|
await client
|
|
.archivePaseoWorktree({ worktreePath: worktree.workspaceDirectory })
|
|
.catch(() => undefined);
|
|
} finally {
|
|
await seeded.cleanup();
|
|
}
|
|
});
|
|
|
|
test("two Local workspaces appear under the same non-git project", async ({ page }) => {
|
|
const seeded: SeededWorkspace = await seedWorkspace({
|
|
repoPrefix: "multiplicity-local-nongit-",
|
|
git: false,
|
|
});
|
|
|
|
try {
|
|
const project = {
|
|
projectKey: seeded.projectId,
|
|
projectDisplayName: seeded.projectDisplayName,
|
|
};
|
|
|
|
await gotoAppShell(page);
|
|
await waitForSidebarHydration(page);
|
|
// Model B: a non-git project is an expandable parent like any other, with
|
|
// its single workspace already rendered as its own row underneath.
|
|
await expect(page.getByTestId(`sidebar-project-row-${seeded.projectId}`)).toBeVisible({
|
|
timeout: 30_000,
|
|
});
|
|
await expect(page.getByTestId(workspaceRowTestId(seeded.workspaceId))).toBeVisible({
|
|
timeout: 30_000,
|
|
});
|
|
|
|
const second = await createWorkspaceViaUi(page, {
|
|
project,
|
|
// Non-git project: no Isolation control, isolation is implicitly local.
|
|
isolation: null,
|
|
previousWorkspaceId: seeded.workspaceId,
|
|
client,
|
|
});
|
|
|
|
expect(second.workspaceId).not.toBe(seeded.workspaceId);
|
|
expect(second.workspaceDirectory).toBe(seeded.workspaceDirectory);
|
|
|
|
// Both the original and the new workspace render as distinct rows under
|
|
// the same expandable parent.
|
|
await expect(page.getByTestId(`sidebar-project-row-${seeded.projectId}`)).toBeVisible({
|
|
timeout: 30_000,
|
|
});
|
|
await expect(page.getByTestId(workspaceRowTestId(seeded.workspaceId))).toBeVisible({
|
|
timeout: 30_000,
|
|
});
|
|
const secondRow = page.getByTestId(workspaceRowTestId(second.workspaceId));
|
|
await expect(secondRow).toBeVisible({ timeout: 30_000 });
|
|
await expect(secondRow).toContainText(second.workspaceName);
|
|
} finally {
|
|
await seeded.cleanup();
|
|
}
|
|
});
|
|
});
|