#675 Wait for commit in tests

atomicdata-dev · Nov 20, 2023 · 2684120 · 2684120
1 parent 2d45bd7
commit 2684120
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/browser/data-browser/tests/documents.spec.ts b/browser/data-browser/tests/documents.spec.ts
@@ -30,14 +30,15 @@ test.describe('documents', async () => {
     await page.press(editableTitle, 'Enter');
 
     const teststring = `My test: ${timestamp()}`;
+
+    const waiter = waitForCommitOnCurrentResource(page);
     await page.fill('textarea', teststring);
+    await waiter;
 
-    // commit editing paragraph
     await expect(page.locator(`text=${teststring}`)).toBeVisible();
 
     // multi-user
     const currentSubject = await getCurrentSubject(page);
-    await waitForCommitOnCurrentResource(page);
     const page2 = await openNewSubjectWindow(browser, currentSubject!);
     await expect(
       page2.locator(`text=${teststring}`),

diff --git a/browser/data-browser/tests/e2e.spec.ts b/browser/data-browser/tests/e2e.spec.ts
@@ -278,21 +278,27 @@ test.describe('data-browser', async () => {
 
     const alphabet = 'abcdefghijklmnopqrstuvwxyz';
 
+    const waiter = waitForCommitOnCurrentResource(page, {
+      set: {
+        ['https://atomicdata.dev/properties/name']: alphabet,
+      },
+    });
+
     for (const letter of alphabet) {
       await page.type(editableTitle, letter, { delay: Math.random() * 300 });
     }
 
+    // wait for commit debounce
+    // make sure no commits are waiting for each other
+    await waiter;
+
     await page.keyboard.press('Escape');
 
     await expect(
       page.locator(`text=${alphabet}`).first(),
       'String not correct after typing, bad typing UX. Maybe views are notified of changes twice?',
     ).toBeVisible();
 
-    // wait for commit debounce
-    // await page.waitForTimeout(2000);
-    // make sure no commits are waiting for each other
-    await waitForCommitOnCurrentResource(page);
     await page.reload();
     await expect(
       page.locator(`text=${alphabet}`).first(),
@@ -422,7 +428,10 @@ test.describe('data-browser', async () => {
     await page.locator(`[title="Create new resource under ${d0}"]`).click();
     await page.click(`button:has-text("${klass}")`);
     const d1 = 'depth1';
+
+    const waiter = waitForCommitOnCurrentResource(page);
     await setTitle(page, d1);
+    await waiter;
 
     await expect(
       page.locator(`[data-test="sidebar"] >> text=${d0}`),
@@ -433,8 +442,6 @@ test.describe('data-browser', async () => {
       "Sidebar doesn't show child resource title",
     ).toBeVisible();
 
-    await waitForCommitOnCurrentResource(page);
-
     await page.reload();
     await expect(
       page.locator(`[data-test="sidebar"] >> text=${d1}`),
@@ -543,18 +550,20 @@ test.describe('data-browser', async () => {
     // Wait for commit debounce
     await page.waitForTimeout(500);
 
+    const waiter = waitForCommitOnCurrentResource(page, {
+      set: {
+        ['https://atomicdata.dev/properties/name']: 'Second Title',
+      },
+    });
     await editTitle('Second Title', page);
+    await waiter;
+
     await expect(
       page.getByRole('heading', { name: 'Second Title', level: 1 }),
     ).toBeVisible();
 
     // The history page does not update when the resource changes so we need to wait to be sure the commit is done
     // before opening the history page.
-    await waitForCommitOnCurrentResource(page, {
-      set: {
-        ['https://atomicdata.dev/properties/name']: 'Second Title',
-      },
-    });
 
     await contextMenuClick('history', page);