Bump jupyter-collaboration v3 (#429)

* Bump jupyter-collaboration v3 * Bump galata * Bump version * Fix tests --------- Co-authored-by: Duc Trung Le <[email protected]>
jupytercad · Sep 19, 2024 · e5acfcf · e5acfcf
1 parent 5d55ebf
commit e5acfcf
Show file tree

Hide file tree

Showing 9 changed files with 1,070 additions and 792 deletions.
diff --git a/packages/base/src/toolbar/widget.tsx b/packages/base/src/toolbar/widget.tsx
diff --git a/python/jupytercad_app/package.json b/python/jupytercad_app/package.json
@@ -51,7 +51,7 @@
   "dependencies": {
     "@codemirror/state": "^6.2.0",
     "@codemirror/view": "^6.9.3",
-    "@jupyter/collaboration": "^2.0.0",
+    "@jupyter/collaboration": "^3.0.0-beta.6",
     "@jupyter/docprovider": "^2.0.0",
     "@jupyter/ydoc": "^0.3.4 || ^1.0.2",
     "@jupytercad/base": "^3.0.0-alpha.1",

diff --git a/python/jupytercad_core/pyproject.toml b/python/jupytercad_core/pyproject.toml
@@ -21,7 +21,7 @@ classifiers = [
 dependencies = [
   "jupyter_server>=2.0.6,<3",
   "jupyter_ydoc>=2,<3",
-  "jupyter-collaboration>=2.1.0,<3",
+  "jupyter-collaboration>=3.0.0b6,<4",
 ]
 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.1.0",
+    "@jupyterlab/galata": "^5.2.5",
     "@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
@@ -29,9 +29,7 @@ test.describe('Sketcher test', () => {
     await page.goto();
 
     const fileName = 'test.jcad';
-    const fullPath = `examples/${fileName}`;
-    await page.notebook.openByPath(fullPath);
-    await page.notebook.activate(fullPath);
+    await page.getByTitle('Create a new JCAD Editor').first().click();
     await page.locator('div.jpcad-Spinner').waitFor({ state: 'hidden' });
 
     await page.waitForTimeout(1000);
@@ -56,11 +54,8 @@ test.describe('Sketcher test', () => {
 
   test(`Should draw a circle`, async ({ page }) => {
     await page.goto();
-
     const fileName = 'test.jcad';
-    const fullPath = `examples/${fileName}`;
-    await page.notebook.openByPath(fullPath);
-    await page.notebook.activate(fullPath);
+    await page.getByTitle('Create a new JCAD Editor').first().click();
     await page.locator('div.jpcad-Spinner').waitFor({ state: 'hidden' });
 
     await page.waitForTimeout(1000);

diff --git a/ui-tests/tests/ui.spec.ts b/ui-tests/tests/ui.spec.ts
@@ -107,9 +107,7 @@ test.describe('UI Test', () => {
       await page.goto();
 
       const fileName = 'test.jcad';
-      const fullPath = `examples/${fileName}`;
-      await page.notebook.openByPath(fullPath);
-      await page.notebook.activate(fullPath);
+      await page.getByTitle('Create a new JCAD Editor').first().click();
       await page.locator('div.jpcad-Spinner').waitFor({ state: 'hidden' });
 
       await page.waitForTimeout(1000);
@@ -118,7 +116,9 @@ test.describe('UI Test', () => {
       }
 
       await page.getByTitle('New Box').click();
-      page.locator('input[id^="id-jp-schemaform"][label="Name"]').fill('Foo');
+      await page
+        .locator('input[id^="id-jp-schemaform"][label="Name"]')
+        .fill('Foo');
       await page
         .locator('div.jp-Dialog-buttonLabel', {
           hasText: 'Submit'

diff --git a/ui-tests/tests/ui.spec.ts-snapshots/Operator-Add-test-jcad-linux.png b/ui-tests/tests/ui.spec.ts-snapshots/Operator-Add-test-jcad-linux.png