Merge remote-tracking branch 'origin/main'

nix/npm-deps.hash

@@ -1 +1 @@
-sha256-WOVtBB7AQke7RM9FDJ1mUDU0sLMf03QOrvajrXSFwPs=
+sha256-6Qx7FBcdaT3IurNfBUGb5I7HQCjZ7Xy0qOcCaHPALI8=

packages/app/e2e/browser/host-appearance.spec.ts

@@ -114,7 +114,6 @@ test.describe("Host appearance", () => {
 
     expect(badgeBox).not.toBeNull();
     expect(rowBox).not.toBeNull();
-    await expect(badge).toHaveCSS("flex-shrink", "1");
     expect(badgeBox!.width).toBeGreaterThan(96);
     expect(badgeBox!.x + badgeBox!.width).toBeLessThanOrEqual(rowBox!.x + rowBox!.width);
     const labelWidths = await badge.getByText(hostName, { exact: true }).evaluate((label) => ({

packages/app/e2e/browser/new-workspace-entry.spec.ts

@@ -19,7 +19,10 @@ import {
   clickArchiveWorkspaceMenuItem,
   expectWorkspaceAbsentFromSidebar,
 } from "../support/helpers/sidebar";
-import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
+import {
+  switchWorkspaceViaSidebar,
+  waitForSidebarHydration,
+} from "../support/helpers/workspace-ui";
 
 // Model B entry points into the New Workspace screen. The surviving entries are
 // the global button (universal) and each project's per-row New workspace icon
@@ -67,6 +70,11 @@ test.describe("New workspace entry points", () => {
       await expect(
         page.getByTestId(`sidebar-workspace-row-${getServerId()}:${seeded.workspaceId}`),
       ).toBeVisible({ timeout: 30_000 });
+      await switchWorkspaceViaSidebar({
+        page,
+        serverId: getServerId(),
+        workspaceId: seeded.workspaceId,
+      });
 
       const globalButton = page.getByTestId("sidebar-global-new-workspace");
       await expect(globalButton).toBeVisible({ timeout: 30_000 });

packages/app/e2e/support/helpers/new-workspace.ts

@@ -241,11 +241,17 @@ export async function expectNewWorkspaceTriggerLabelsAligned(
 ): Promise<void> {
   const projectTrigger = page.getByRole("button", { name: "Workspace project" });
   const hostTrigger = page.getByRole("button", { name: "Host", exact: true });
+  const projectLabel = projectTrigger.getByText(input.projectLabel, { exact: true });
+  const hostLabel = hostTrigger.getByText(input.hostLabel, { exact: true });
+  await Promise.all([
+    expect(projectLabel).toBeVisible({ timeout: 30_000 }),
+    expect(hostLabel).toBeVisible({ timeout: 30_000 }),
+  ]);
   const [projectTriggerBox, projectLabelBox, hostTriggerBox, hostLabelBox] = await Promise.all([
     projectTrigger.boundingBox(),
-    projectTrigger.getByText(input.projectLabel, { exact: true }).boundingBox(),
+    projectLabel.boundingBox(),
     hostTrigger.boundingBox(),
-    hostTrigger.getByText(input.hostLabel, { exact: true }).boundingBox(),
+    hostLabel.boundingBox(),
   ]);
   if (!projectTriggerBox || !projectLabelBox || !hostTriggerBox || !hostLabelBox) {
     throw new Error("New Workspace trigger geometry could not be measured");