fix(test): close notification before start

logseq · Mar 27, 2023 · 541592d · 541592d
1 parent 38fc459
commit 541592d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/e2e-tests/fixtures.ts b/e2e-tests/fixtures.ts
@@ -121,12 +121,6 @@ base.beforeEach(async () => {
     await page.keyboard.press('Escape')
     await page.keyboard.press('Escape')
 
-    /*
-    const locator = page.locator('.notification-close-button').first()
-    while (await locator.isVisible()) {
-      locator.click() // ignore error
-    }
-    */
     await expect(page.locator('.notification-close-button')).not.toBeVisible()
 
     const rightSidebar = page.locator('.cp__right-sidebar-inner')
@@ -297,7 +291,7 @@ export let traceAll = function(){
   test.beforeAll(async () => {
     await context.tracing.startChunk();
   })
-  
+
   test.afterAll(async () => {
     await context.tracing.stopChunk({ path: getTracingFilePath() });
   })

diff --git a/e2e-tests/utils.ts b/e2e-tests/utils.ts
@@ -143,15 +143,13 @@ export async function loadLocalGraph(page: Page, path: string): Promise<void> {
 
   // If there is an error notification from a previous test graph being deleted,
   // close it first so it doesn't cover up the UI
-  let locator = page.locator('.notification-close-button').first()
-  while (await locator?.isVisible()) {
-    try { // don't fail if unable to click (likely disappeared already)
-      await locator.click()
-    } catch (error) {}
-    await page.waitForTimeout(250)
-
-    expect(locator.isVisible()).resolves.toBe(false)
+  let n = await page.locator('.notification-close-button').count()
+  if (n > 1) {
+    await page.locator('button >> text="Clear all"').click()
+  } else if (n == 1) {
+    await page.locator('.notification-close-button').click()
   }
+  await expect(page.locator('.notification-close-button').first()).not.toBeVisible({ timeout: 2000 })
 
   console.log('Graph loaded for ' + path)
 }