From f25a781fc06760128361bcc5395056016b28b9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Collonval?= Date: Thu, 9 Feb 2023 12:59:11 +0100 Subject: [PATCH] Fix more selector --- galata/test/benchmark/notebook.spec.ts | 6 ++++-- .../documentation/export_notebook.test.ts | 4 +++- galata/test/documentation/general.test.ts | 20 ++++++++++--------- .../internationalization.test.ts | 6 +++--- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/galata/test/benchmark/notebook.spec.ts b/galata/test/benchmark/notebook.spec.ts index 9de103884b17..c5c3a939ea53 100644 --- a/galata/test/benchmark/notebook.spec.ts +++ b/galata/test/benchmark/notebook.spec.ts @@ -140,7 +140,9 @@ test.describe('Benchmark', () => { // Shutdown the kernel to be sure it does not get in our way (especially for the close action) await page.click('li[role="menuitem"]:has-text("Kernel")'); - await page.click('ul[role="menu"] >> text=Shut Down All Kernels…'); + await page.click( + '.lm-Menu ul[role="menu"] >> text=Shut Down All Kernels…' + ); await page.click('button:has-text("Shut Down All") >> nth=-1'); // Click on the last matched button. // Open text file @@ -192,7 +194,7 @@ test.describe('Benchmark', () => { // Close notebook await page.click('li[role="menuitem"]:has-text("File")'); const closeTime = await perf.measure(async () => { - await page.click('ul[role="menu"] >> text=Close Tab'); + await page.click('.lm-Menu ul[role="menu"] >> text=Close Tab'); // Revert changes so we don't measure saving const dimissButton = page.locator('button:has-text("Discard")'); if (await dimissButton.isVisible({ timeout: 50 })) { diff --git a/galata/test/documentation/export_notebook.test.ts b/galata/test/documentation/export_notebook.test.ts index f26be8ca4874..e04ef69dd7a0 100644 --- a/galata/test/documentation/export_notebook.test.ts +++ b/galata/test/documentation/export_notebook.test.ts @@ -24,7 +24,9 @@ test.describe('Export Notebook', () => { await page.waitForSelector('text=Python 3 (ipykernel) | Idle'); await page.click('text=File'); - await page.click('ul[role="menu"] >> text=Save and Export Notebook As'); + await page.click( + '.lm-Menu ul[role="menu"] >> text=Save and Export Notebook As' + ); // Wait for Latex renderer await page.waitForSelector('text=(𝜎σ, 𝛽β, 𝜌ρ)'); diff --git a/galata/test/documentation/general.test.ts b/galata/test/documentation/general.test.ts index e0a0bcaff02b..8fb30c077145 100644 --- a/galata/test/documentation/general.test.ts +++ b/galata/test/documentation/general.test.ts @@ -41,11 +41,11 @@ test.describe('General', () => { await page.dblclick('text=Lorenz.ipynb'); await page.click('text=File'); - await page.click('ul[role="menu"] >> text=New'); + await page.click('.lm-Menu ul[role="menu"] >> text=New'); await page.click('#jp-mainmenu-file-new >> text=Terminal'); await page.click('text=File'); - await page.click('ul[role="menu"] >> text=New'); + await page.click('.lm-Menu ul[role="menu"] >> text=New'); await page.click('#jp-mainmenu-file-new >> text=Console'); await page.click('button:has-text("Select")'); @@ -200,7 +200,7 @@ test.describe('General', () => { await page.click('text=File'); await page.mouse.move(70, 40); const fileMenuNewItem = await page.waitForSelector( - 'ul[role="menu"] >> text=New' + '.lm-Menu ul[role="menu"] >> text=New' ); await fileMenuNewItem.click(); @@ -269,8 +269,8 @@ test.describe('General', () => { await page.click('text=File'); await page.mouse.move(70, 40); - await page.click('ul[role="menu"] >> text=New'); - await page.hover('ul[role="menu"] >> text=Text File'); + await page.click('.lm-Menu ul[role="menu"] >> text=New'); + await page.hover('.lm-Menu ul[role="menu"] >> text=Text File'); // Inject mouse await page.evaluate( @@ -322,7 +322,7 @@ test.describe('General', () => { await page.dblclick('text=jupyterlab.md'); await page.click('text=Settings'); - await page.click('ul[role="menu"] >> text=Text Editor Key Map'); + await page.click('.lm-Menu ul[role="menu"] >> text=Text Editor Key Map'); expect( await page.screenshot({ clip: { y: 0, x: 260, width: 600, height: 450 } }) @@ -426,7 +426,7 @@ test.describe('General', () => { // Open a terminal await page.click('text=File'); - await page.click('ul[role="menu"] >> text=New'); + await page.click('.lm-Menu ul[role="menu"] >> text=New'); await page.click('#jp-mainmenu-file-new >> text=Terminal'); // Wait for the xterm.js element to be added in the DOM @@ -455,7 +455,7 @@ test.describe('General', () => { // Open a terminal await page.click('text=File'); - await page.click('ul[role="menu"] >> text=New'); + await page.click('.lm-Menu ul[role="menu"] >> text=New'); await page.click('#jp-mainmenu-file-new >> text=Terminal'); await page.dblclick( @@ -529,7 +529,9 @@ test.describe('General', () => { await page.notebook.run(); await page.click('text=File'); - await page.click('ul[role="menu"] >> text=New Console for Notebook'); + await page.click( + '.lm-Menu ul[role="menu"] >> text=New Console for Notebook' + ); await page.click('.jp-CodeConsole-input >> .cm-content'); await page.keyboard.type( diff --git a/galata/test/documentation/internationalization.test.ts b/galata/test/documentation/internationalization.test.ts index 5d57cad46cf2..5b001631a745 100644 --- a/galata/test/documentation/internationalization.test.ts +++ b/galata/test/documentation/internationalization.test.ts @@ -17,7 +17,7 @@ test.describe('Internationalization', () => { await setSidebarWidth(page); await page.click('text=Settings'); - await page.click('ul[role="menu"] >> text=Language'); + await page.click('.lm-Menu ul[role="menu"] >> text=Language'); expect( await page.screenshot({ clip: { y: 5, x: 250, width: 800, height: 600 } }) @@ -30,7 +30,7 @@ test.describe('Internationalization', () => { await setSidebarWidth(page); await page.click('text=Settings'); - await page.click('ul[role="menu"] >> text=Language'); + await page.click('.lm-Menu ul[role="menu"] >> text=Language'); await page.click('#jp-mainmenu-settings-language >> text=Chinese'); expect( @@ -45,7 +45,7 @@ test.describe('Internationalization', () => { await page.goto(); await page.click('text=Settings'); - await page.click('ul[role="menu"] >> text=Language'); + await page.click('.lm-Menu ul[role="menu"] >> text=Language'); await page.click('#jp-mainmenu-settings-language >> text=Chinese'); await Promise.all([