fix last jupyterlab tests

Author: tomjakubowski

packages/perspective-jupyterlab/test/jupyter/utils.js

@@ -90,7 +90,7 @@ const describe_jupyter = (body, { name, root } = {}) => {
  * @param {*} cells
  * @param {*} body
  */
-const test_jupyter = (name, cells, body, args = {}) => {
+const test_jupyter = (name, cells, body) => {
     const notebook_name = `${name.replace(/[ \.']/g, "_")}.ipynb`;
     generate_notebook(notebook_name, cells);
     const url = `doc/tree/${notebook_name}`;

packages/perspective-jupyterlab/test/jupyter/widget.spec.js

@@ -41,20 +41,23 @@ describe_jupyter(
             async ({ page }) => {
                 const viewer = await default_body(page);
                 const num_columns = await viewer.evaluate(async (viewer) => {
-                    const tbl = viewer.querySelector("regular-table");
+                    const tbl = viewer
+                        .querySelector("perspective-viewer-datagrid")
+                        .shadowRoot.querySelector("regular-table");
                     return tbl.querySelector("thead tr").childElementCount;
                 });
 
                 expect(num_columns).toEqual(3);
 
                 const num_rows = await viewer.evaluate(async (viewer) => {
-                    const tbl = viewer.querySelector("regular-table");
+                    const tbl = viewer
+                        .querySelector("perspective-viewer-datagrid")
+                        .shadowRoot.querySelector("regular-table");
                     return tbl.querySelectorAll("tbody tr").length;
                 });
 
                 expect(num_rows).toEqual(5);
-            },
-            { timeout: 120000 }
+            }
         );
 
         test_jupyter(
@@ -70,14 +73,18 @@ describe_jupyter(
             async ({ page }) => {
                 const viewer = await default_body(page);
                 const num_columns = await viewer.evaluate(async (viewer) => {
-                    const tbl = viewer.querySelector("regular-table");
+                    const tbl = viewer
+                        .querySelector("perspective-viewer-datagrid")
+                        .shadowRoot.querySelector("regular-table");
                     return tbl.querySelector("thead tr").childElementCount;
                 });
 
                 expect(num_columns).toEqual(3);
 
                 const num_rows = await viewer.evaluate(async (viewer) => {
-                    const tbl = viewer.querySelector("regular-table");
+                    const tbl = viewer
+                        .querySelector("perspective-viewer-datagrid")
+                        .shadowRoot.querySelector("regular-table");
                     return tbl.querySelectorAll("tbody tr").length;
                 });
 
@@ -96,14 +103,19 @@ describe_jupyter(
             async ({ page }) => {
                 const viewer = await default_body(page);
                 const num_columns = await viewer.evaluate(async (viewer) => {
-                    const tbl = viewer.querySelector("regular-table");
+                    const tbl = viewer
+                        .querySelector("perspective-viewer-datagrid")
+                        .shadowRoot.querySelector("regular-table");
+
                     return tbl.querySelector("thead tr").childElementCount;
                 });
 
                 expect(num_columns).toEqual(3);
 
                 const num_rows = await viewer.evaluate(async (viewer) => {
-                    const tbl = viewer.querySelector("regular-table");
+                    const tbl = viewer
+                        .querySelector("perspective-viewer-datagrid")
+                        .shadowRoot.querySelector("regular-table");
                     return tbl.querySelectorAll("tbody tr").length;
                 });