chore: fix tests

Author: harbournick

tests/behavior/helpers/comments.ts

@@ -69,18 +69,21 @@ export async function activateCommentDialog(
     await superdoc.waitForStable();
   }
 
+  const activeDialog = superdoc.page.locator('.comment-placeholder .comments-dialog.is-active').last();
   const dialog = activeCommentDialog(superdoc.page);
-  const isActive = await dialog.isVisible({ timeout: 2_000 }).catch(() => false);
+  const hasActiveDialog = (await activeDialog.count()) > 0;
 
-  if (!isActive) {
+  if (!hasActiveDialog) {
     // Fallback: click the floating dialog directly to trigger setFocus → is-active
     const floatingDialog = superdoc.page.locator('.comment-placeholder .comments-dialog').last();
     await expect(floatingDialog).toBeVisible({ timeout: timeoutMs });
-    await floatingDialog.click();
+    // Click near the top-left to avoid accidentally hitting interactive controls
+    // such as the "N more replies" collapse/expand pill in the middle of the card.
+    await floatingDialog.click({ position: { x: 12, y: 12 } });
     await superdoc.waitForStable();
 
-    const isActiveNow = await dialog.isVisible({ timeout: 2_000 }).catch(() => false);
-    if (!isActiveNow) {
+    const hasActiveDialogNow = (await activeDialog.count()) > 0;
+    if (!hasActiveDialogNow) {
       // Last resort: set activeComment directly on the Pinia store. This is
       // needed when click events don't propagate to activate the dialog
       // (Firefox/WebKit) or replyToComment calls set it to a child ID.
@@ -99,6 +102,11 @@ export async function activateCommentDialog(
     }
   }
 
+  if ((await activeDialog.count()) > 0) {
+    await expect(activeDialog).toBeVisible({ timeout: timeoutMs });
+    return activeDialog;
+  }
+
   await expect(dialog).toBeVisible({ timeout: timeoutMs });
   return dialog;
 }

tests/behavior/tests/comments/comment-thread-collapse.spec.ts

@@ -1,5 +1,5 @@
 import { test, expect } from '../../fixtures/superdoc.js';
-import { addCommentViaUIWithId, activateCommentDialog } from '../../helpers/comments.js';
+import { addCommentViaUIWithId } from '../../helpers/comments.js';
 import { assertDocumentApiReady, replyToComment } from '../../helpers/document-api.js';
 
 test.use({ config: { toolbar: 'full', comments: 'on' } });
@@ -42,13 +42,15 @@ test('thread with 2+ replies collapses and expands on click', async ({ superdoc
   });
   await superdoc.waitForStable();
 
-  // Wait for dialog to lose active state before re-activating — Firefox needs
-  // this gap so the component fully unmounts its expanded state.
-  const activeDialog = superdoc.page.locator('.comment-placeholder .comments-dialog.is-active');
-  await expect(activeDialog).toHaveCount(0, { timeout: 5_000 });
+  // Activate parent thread deterministically (avoid click-path races in Firefox).
+  await superdoc.page.evaluate((id: string) => {
+    const sd = (window as any).superdoc;
+    sd.commentsStore.$patch({ activeComment: id });
+  }, commentId);
+  await superdoc.waitForStable();
 
-  // Activate the comment dialog
-  const dialog = await activateCommentDialog(superdoc, 'collapse');
+  const dialog = superdoc.page.locator(`.comment-placeholder[data-comment-id="${commentId}"] .comments-dialog`).first();
+  await expect(dialog).toBeVisible({ timeout: 10_000 });
 
   // The collapsed-replies pill should be visible with "more replies" text
   const collapsedPill = dialog.locator('.collapsed-replies');