update tests

assure column settings is open before editing or renaming columns

rust/perspective-viewer/test/js/column_settings.spec.ts

@@ -95,6 +95,7 @@ test.describe("Plugin Styles", () => {
         await exprCol.editBtn.waitFor();
         await rowId.editBtn.waitFor({ state: "detached", timeout: 1000 });
 
+        await view.assureColumnSettingsClosed();
         await exprCol.editBtn.click();
         await checkTab(view.columnSettingsSidebar, false, true);
     });
@@ -110,8 +111,7 @@ test.describe("Plugin Styles", () => {
         let col = activeColumns.getColumnByName("expr");
         await inactiveColumns.container.waitFor({ state: "hidden" });
         await activeColumns.scrollToBottom();
-        await col.editBtn.click();
-        await sidebar.container.waitFor({ state: "visible" });
+        await view.assureColumnSettingsOpen(col);
         await checkTab(sidebar, true, true, true);
         let tabs = await sidebar.tabTitle.all();
         await tabs[1].click();

rust/perspective-viewer/test/js/column_settings/datagrid.spec.ts

@@ -139,13 +139,13 @@ let runTests = (title: string, beforeEachAndLocalTests: () => void) => {
             let table = view.dataGrid.regularTable;
 
             let col = await view.getOrCreateColumnByType("calendar");
-            await col.editBtn.click();
             let name = await col.name.innerText();
             expect(name).toBeTruthy();
             let td = await table.getFirstCellByColumnName(name);
             await td.waitFor();
 
             // text style
+            view.assureColumnSettingsOpen(col);
             await view.columnSettingsSidebar.openTab("style");
             let contents = view.columnSettingsSidebar.styleTab.contents;
             let checkbox = contents
@@ -173,13 +173,13 @@ let runTests = (title: string, beforeEachAndLocalTests: () => void) => {
             let table = view.dataGrid.regularTable;
 
             let col = await view.getOrCreateColumnByType("string");
-            await col.editBtn.click();
             let name = await col.name.innerText();
             expect(name).toBeTruthy();
             let td = await table.getFirstCellByColumnName(name);
             await td.waitFor();
 
             // bg color
+            await view.assureColumnSettingsOpen(col);
             await view.columnSettingsSidebar.openTab("style");
             let contents = view.columnSettingsSidebar.styleTab.contents;
             let checkbox = contents.locator("input[type=checkbox]").last();
@@ -208,7 +208,10 @@ runTests("Datagrid Column Styles", () => {
         });
     });
 
-    test("Edit highlights go away when view re-draws", async ({ page }) => {
+    // Keeping the column sidebar open makes this unncessary.
+    test.skip("Edit highlights go away when view re-draws", async ({
+        page,
+    }) => {
         let viewer = new PspViewer(page);
         await viewer.openSettingsPanel();
         let btn = await viewer.dataGrid.regularTable.getEditBtnByName("Row ID");

tools/perspective-test/src/js/models/column_settings.ts

@@ -10,7 +10,7 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-import { Locator } from "@playwright/test";
+import { Locator, expect } from "@playwright/test";
 import { PageView } from "./page";
 
 export class ColumnSettingsSidebar {
@@ -37,7 +37,7 @@ export class ColumnSettingsSidebar {
 
     async openTab(name: string) {
         let locator = this.tabTitle.filter({ hasText: name });
-        await locator.click();
+        await locator.click({ timeout: 1000 });
         await this.container
             .locator(".tab.selected", { hasText: name })
             .waitFor({ timeout: 1000 });

tools/perspective-test/src/js/models/page.ts

@@ -12,7 +12,7 @@
 
 import { Locator, Page, expect } from "@playwright/test";
 import { ColumnSettingsSidebar } from "./column_settings";
-import { ColumnType, SettingsPanel } from "./settings_panel";
+import { ColumnSelector, ColumnType, SettingsPanel } from "./settings_panel";
 import { DataGridPlugin } from "./plugins";
 
 /**
@@ -96,4 +96,22 @@ export class PageView {
             await viewer!.restore(settings);
         }, settings);
     }
+
+    async assureColumnSettingsOpen(column: ColumnSelector) {
+        let isEditing = await column.editBtn.evaluate((btn) =>
+            btn.className.includes("is-editing")
+        );
+        if (!isEditing) {
+            this.container.evaluate((_) =>
+                console.log("COLUMN SETTINGS CLOSED")
+            );
+            await column.editBtn.click({ force: true });
+        }
+        expect(this.container).toBeVisible({ timeout: 1000 });
+    }
+    async assureColumnSettingsClosed() {
+        if (await this.columnSettingsSidebar.container.isVisible()) {
+            await this.columnSettingsSidebar.closeBtn.click();
+        }
+    }
 }

tools/perspective-test/src/js/models/settings_panel.ts

@@ -42,6 +42,7 @@ export class SettingsPanel {
         this.orderbyInput = viewer.locator("#sort input");
         this.whereInput = viewer.locator("#filter input");
     }
+
     /**
      * Creates and saves a new expression column.
      * @param expr
@@ -92,7 +93,7 @@ export class SettingsPanel {
      * @param expr
      */
     async renameExpression(column: ColumnSelector, name: string) {
-        await column.editBtn.click();
+        this.pageView.assureColumnSettingsOpen(column);
         let sidebar = this.pageView.columnSettingsSidebar;
         await sidebar.nameInput.waitFor({
             state: "visible",
@@ -106,7 +107,7 @@ export class SettingsPanel {
     }
 
     async editExpression(column: ColumnSelector, newExpression: string) {
-        await column.editBtn.click();
+        this.pageView.assureColumnSettingsOpen(column);
         let sidebar = this.pageView.columnSettingsSidebar;
         await sidebar.openTab("Attributes");
         let exprEditor = sidebar.attributesTab.expressionEditor;