From f111ec3f8e6c9a1f0f4549f3b6ad2fff6439c068 Mon Sep 17 00:00:00 2001
From: Andelf <andelf@gmail.com>
Date: Mon, 22 Aug 2022 18:52:36 +0800
Subject: [PATCH] fix(test): resolve e2e fails

---
 e2e-tests/context-menu.spec.ts | 25 +++++++++++++++----------
 e2e-tests/fixtures.ts          |  5 +++++
 e2e-tests/page-search.spec.ts  |  6 +++---
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/e2e-tests/context-menu.spec.ts b/e2e-tests/context-menu.spec.ts
index 41d54829cc..70effcdb67 100644
--- a/e2e-tests/context-menu.spec.ts
+++ b/e2e-tests/context-menu.spec.ts
@@ -12,21 +12,21 @@ test('open context menu', async ({ page }) => {
 
 test('close context menu on esc', async ({ page }) => {
     await createRandomPage(page)
-  
+
     await page.locator('span.bullet-container >> nth=0').click({button: "right"})
 
     await page.keyboard.press('Escape')
-  
+
     await expect(page.locator('#custom-context-menu')).toHaveCount(0)
 })
 
 test('close context menu by left clicking on empty space', async ({ page }) => {
     await createRandomPage(page)
-  
+
     await page.locator('span.bullet-container >> nth=0').click({button: "right"})
 
     await page.mouse.click(0, 200, {button: "left"})
-  
+
     await expect(page.locator('#custom-context-menu')).toHaveCount(0)
 })
 
@@ -35,21 +35,26 @@ test('close context menu by clicking on a menu item', async ({ page }) => {
 
     await page.locator('span.bullet-container >> nth=0').click({button: "right"})
 
-    await page.locator('#custom-context-menu .menu-link >> nth=0').click()
+    await page.locator('#custom-context-menu .menu-link >> nth=1').click()
 
     await expect(page.locator('#custom-context-menu')).toHaveCount(0)
 })
 
-test('close context menu by clicking on a block', async ({ page }) => {
+test('close context menu by clicking on a block', async ({ page, block }) => {
     await createRandomPage(page)
 
-    await page.locator('span.bullet-container >> nth=0').click({button: "right"})
+    await block.mustType('fist Block')
+    await block.enterNext()
 
-    const elementHandle = await page.$('.block-content >> nth=0');
+    await page.locator('span.bullet-container >> nth=-1').click({button: "right"})
+
+    const elementHandle = page.locator('.block-content >> nth=0');
 
     const box = await elementHandle.boundingBox();
-
-    await page.mouse.click(box.x + box.width - 5, box.y + box.height / 2);
+    expect(box).toBeTruthy()
+    if (box) {
+        await page.mouse.click(box.x + box.width - 5, box.y + box.height / 2);
+    }
 
     await expect(page.locator('#custom-context-menu')).toHaveCount(0)
 })
diff --git a/e2e-tests/fixtures.ts b/e2e-tests/fixtures.ts
index e7e6690a60..8e4bcb2c67 100644
--- a/e2e-tests/fixtures.ts
+++ b/e2e-tests/fixtures.ts
@@ -106,6 +106,11 @@ base.beforeEach(async () => {
   if (page) {
     await page.keyboard.press('Escape')
     await page.keyboard.press('Escape')
+
+    const rightSidebar = page.locator('.cp__right-sidebar-inner')
+    if (await rightSidebar.isVisible()) {
+      await page.click('button.toggle-right-sidebar', {delay: 100})
+    }
   }
 })
 
diff --git a/e2e-tests/page-search.spec.ts b/e2e-tests/page-search.spec.ts
index ac949048f3..96f075427f 100644
--- a/e2e-tests/page-search.spec.ts
+++ b/e2e-tests/page-search.spec.ts
@@ -38,7 +38,7 @@ import { IsMac, createRandomPage, newBlock, newInnerBlock, randomString, lastBlo
   await page.fill('[placeholder="Search or create page"]', 'Einführung in die Allgemeine Sprachwissenschaft' + rand)
 
   await page.waitForTimeout(500)
-  const results = await page.$$('#ui__ac-inner .block')
+  const results = await page.$$('#ui__ac-inner>div')
   expect(results.length).toEqual(3) // 2 blocks + 1 page
   await page.keyboard.press("Escape")
 })
@@ -68,7 +68,7 @@ async function alias_test(page: Page, page_name: string, search_kws: string[]) {
   await page.waitForTimeout(500)
 
   // build target Page with alias
-  // the target page will contains the content in 
+  // the target page will contains the content in
   //   alias_test_content_1,
   //   alias_test_content_2, and
   //   alias_test_content_3 sequentialy, to validate the target page state
@@ -127,7 +127,7 @@ async function alias_test(page: Page, page_name: string, search_kws: string[]) {
     await page.fill('[placeholder="Search or create page"]', kw_name)
     await page.waitForTimeout(500)
 
-    const results = await page.$$('#ui__ac-inner .block')
+    const results = await page.$$('#ui__ac-inner>div')
     expect(results.length).toEqual(3) // page + block + alias property
 
     // test search results