Unpin jupyterlab in ui-tests (#251)

* Unpin jupyterlab in ui-tests * Update galata * Fix pinning * Update snapshot * Debug * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Fix --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
jupytercad · Feb 9, 2024 · aec83a2 · aec83a2
1 parent 80b9371
commit aec83a2
Show file tree

Hide file tree

Showing 9 changed files with 501 additions and 408 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -138,7 +138,7 @@ jobs:
           environment-name: cad
           create-args: >-
             python=3.9
-            jupyterlab=4.0.12
+            jupyterlab
             pythonocc-core=7.7.0
 
       - name: Download extension package

diff --git a/python/jupytercad/pyproject.toml b/python/jupytercad/pyproject.toml
@@ -19,9 +19,9 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-  "jupytercad_core>=1.0.0a0,<2",
-  "jupytercad_lab>=1.0.0a0,<2",
-  "jupytercad_app>=1.0.0a0,<2",
+  "jupytercad_core>=2.0.0a0,<3",
+  "jupytercad_lab>=2.0.0a0,<3",
+  "jupytercad_app>=2.0.0a0,<3",
 ]
 dynamic = ["version"]
 license = {file = "LICENSE"}

diff --git a/python/jupytercad_app/pyproject.toml b/python/jupytercad_app/pyproject.toml
@@ -24,8 +24,8 @@ classifiers = [
 ]
 dependencies = [
   "jupyter_server>=2.0.1,<3",
-  "jupytercad_core>=1.0.0a0,<2",
-  "jupytercad_lab>=1.0.0a0,<2",
+  "jupytercad_core>=2.0.0a0,<3",
+  "jupytercad_lab>=2.0.0a0,<3",
 ]
 dynamic = ["version", "description", "authors", "urls", "keywords"]
 license = {file = "LICENSE"}

diff --git a/python/jupytercad_lab/pyproject.toml b/python/jupytercad_lab/pyproject.toml
@@ -32,7 +32,7 @@ dependencies = [
   "yjs-widgets>=0.3.4,<0.4",
   "comm>=0.1.2,<0.2.0",
   "pydantic>=2,<3",
-  "jupytercad_core>=1.0.0a0,<2",
+  "jupytercad_core>=2.0.0a0,<3",
 ]
 dynamic = ["version", "description", "authors", "urls", "keywords"]
 license = {file = "LICENSE"}

diff --git a/ui-tests/package.json b/ui-tests/package.json
@@ -10,7 +10,7 @@
     "test:debug": "PWDEBUG=1 npx playwright test --workers 1"
   },
   "devDependencies": {
-    "@jupyterlab/galata": "^5.0.8",
+    "@jupyterlab/galata": "^5.1.0",
     "@playwright/test": "^1.32.0",
     "@types/klaw-sync": "^6.0.1"
   },

diff --git a/ui-tests/tests/sketcher.spec.ts b/ui-tests/tests/sketcher.spec.ts
@@ -40,10 +40,7 @@ test.describe('Sketcher test', () => {
       .getByRole('tab', { name: 'JupyterCad Control Panel' })
       .click();
 
-    const btn = await page.locator(
-      "button.jp-ToolbarButtonComponent[data-command='jupytercad:sketch']"
-    );
-    await btn.click();
+    await page.getByTitle('New Sketch').click();
     const dialog = await page.$('.lm-Widget.lm-Panel.jp-Dialog-content');
     if (dialog) {
       expect(await dialog.screenshot()).toMatchSnapshot({
@@ -68,10 +65,7 @@ test.describe('Sketcher test', () => {
       .getByRole('tab', { name: 'JupyterCad Control Panel' })
       .click();
 
-    const btn = await page.locator(
-      "button.jp-ToolbarButtonComponent[data-command='jupytercad:sketch']"
-    );
-    await btn.click();
+    await page.getByTitle('New Sketch').click();
     await page.getByRole('button', { name: 'CIRCLE' }).click();
     await page
       .locator('canvas')

diff --git a/ui-tests/tests/tree.spec.ts-snapshots/Tree-Display-test-jcad-linux.png b/ui-tests/tests/tree.spec.ts-snapshots/Tree-Display-test-jcad-linux.png
diff --git a/ui-tests/tests/ui.spec.ts b/ui-tests/tests/ui.spec.ts
@@ -108,18 +108,13 @@ test.describe('UI Test', () => {
       await page.notebook.openByPath(fullPath);
       await page.notebook.activate(fullPath);
       await page.locator('div.jpcad-Spinner').waitFor({ state: 'hidden' });
-      const btn = await page.locator(
-        "button.jp-ToolbarButtonComponent[data-command='jupytercad:newBox']"
-      );
-      await btn.click();
-      const nameInput = await page.locator(
-        'input[id^="id-jp-schemaform"][label="Name"]'
-      );
-      nameInput.fill('Foo');
-      const accept = await page.locator('div.jp-Dialog-buttonLabel', {
-        hasText: 'Submit'
-      });
-      accept.click();
+      await page.getByTitle('New Box').click();
+      page.locator('input[id^="id-jp-schemaform"][label="Name"]').fill('Foo');
+      await page
+        .locator('div.jp-Dialog-buttonLabel', {
+          hasText: 'Submit'
+        })
+        .click();
 
       await page
         .getByRole('tablist', { name: 'main sidebar' })
@@ -237,10 +232,7 @@ test.describe('UI Test', () => {
       await page.locator('div.jpcad-Spinner').waitFor({ state: 'hidden' });
 
       // Create a cone
-      const btn = await page.locator(
-        "button.jp-ToolbarButtonComponent[data-command='jupytercad:newCone']"
-      );
-      await btn.click();
+      await page.getByTitle('New Cone').click();
       await page.getByLabel('Radius1').click();
       await page.getByLabel('Radius1').fill('15');
       await page.getByLabel('Radius2').click();
@@ -276,10 +268,7 @@ test.describe('UI Test', () => {
       await page.waitForTimeout(1000);
 
       // Apply a cut operator from the selection
-      const cutbtn = await page.locator(
-        "button.jp-ToolbarButtonComponent[data-command='jupytercad:cut']"
-      );
-      await cutbtn.click();
+      await page.getByTitle('Cut').click();
       await page
         .locator('.jp-Dialog-body')
         .locator('div.jp-Dialog-buttonLabel', {