Backport PR #15355: More robust galata/UI tests (#15450)

Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>
jupyterlab · Nov 29, 2023 · 118ea00 · 118ea00
1 parent 338df29
commit 118ea00
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/galata/src/helpers/activity.ts b/galata/src/helpers/activity.ts
@@ -51,13 +51,11 @@ export class ActivityHelper {
       return activeTab === name;
     } else {
       const tab = await this.getTab(name);
-      return (
-        (tab &&
-          (await tab.evaluate((tab: Element) =>
-            tab.classList.contains('jp-mod-current')
-          ))) ??
-        false
-      );
+      if (!tab) {
+        return false;
+      }
+      const classes = ((await tab.getAttribute('class')) ?? '').split(' ');
+      return classes.includes('jp-mod-current');
     }
   }
 

diff --git a/galata/test/jupyterlab/kernel.test.ts b/galata/test/jupyterlab/kernel.test.ts
@@ -12,7 +12,9 @@ test.describe('Kernel', () => {
         page
           .getByRole('tabpanel', { name: 'Launcher' })
           .waitFor({ state: 'detached' }),
-        page.getByTitle('Python 3 (ipykernel)').nth(1).click()
+        page
+          .locator('[data-category="Notebook"][title="Python 3 (ipykernel)"]')
+          .click()
       ]);
 
       await expect.soft(page.locator('.jp-Dialog')).toHaveCount(0);
@@ -112,14 +114,16 @@ test.describe('Kernel', () => {
         page
           .getByRole('tabpanel', { name: 'Launcher' })
           .waitFor({ state: 'detached' }),
-        page.getByTitle('Python 3 (ipykernel)').nth(2).click()
+        page
+          .locator('[data-category="Console"][title="Python 3 (ipykernel)"]')
+          .click()
       ]);
-
       await expect.soft(page.locator('.jp-Dialog')).toHaveCount(0);
 
-      await expect(page.getByTitle('Change kernel for Console 1')).toHaveText(
-        'Python 3 (ipykernel) | Idle'
-      );
+      await page
+        .getByTitle('Change kernel for Console 1')
+        .getByText('Python 3 (ipykernel) | Idle')
+        .waitFor();
     });
 
     test('Should ask for kernel when creating console from menu', async ({
@@ -132,9 +136,10 @@ test.describe('Kernel', () => {
         .getByRole('button', { name: 'Select Kernel', exact: true })
         .click();
 
-      await expect(page.getByTitle('Change kernel for Console 1')).toHaveText(
-        'Python 3 (ipykernel) | Idle'
-      );
+      await page
+        .getByTitle('Change kernel for Console 1')
+        .getByText('Python 3 (ipykernel) | Idle')
+        .waitFor();
     });
   });
 });