Fix tests broken due to widget gallery changes

test/chart.ts

@@ -44,12 +44,15 @@ describe('chart', function () {
       await chooseColumnFromFieldDropdown(/Values/, /num/);
       await chooseColumnFromFieldDropdown(/Labels/, /choice list/);
 
-      assert.equal(
-        await driver.find('.plotly_editor_plot').getText(),
+      const result =
         // Percentages inside the pie chart
         '55.6%\n44.4%\n' +
         // Legend
-        'choice B\nchoice A',
+        'choice B\nchoice A';
+
+      assert.equal(
+        await driver.findContentWait('.plotly_editor_plot', result, 2000).getText(),
+        result
       );
     });
   });

test/getGrist.ts

@@ -1,7 +1,7 @@
 import {ChildProcess, execSync, spawn} from 'child_process';
 import FormData from 'form-data';
 import fs from 'fs';
-import {driver} from 'mocha-webdriver';
+import { driver, enableDebugCapture } from 'mocha-webdriver';
 import fetch from 'node-fetch';
 
 import {GristWebDriverUtils} from 'test/gristWebDriverUtils';
@@ -17,6 +17,8 @@ export function getGrist(): GristUtils {
   const server = new GristTestServer();
   const grist = new GristUtils(server);
 
+  enableDebugCapture()
+
   before(async function () {
     // Server will have started up in a global fixture, we just
     // need to make sure it is ready.
@@ -198,17 +200,16 @@ export class GristUtils extends GristWebDriverUtils {
     await this.waitForServer();
   }
 
-
-
   public async clickWidgetPane() {
-    const elem = this.driver.find('.test-config-widget-select .test-select-open');
+    const elem = this.driver.find('.test-custom-widget-gallery-container');
     if (await elem.isPresent()) {
       await elem.click();
     }
   }
 
   public async selectCustomWidget(text: string | RegExp) {
-    await this.driver.findContent('.test-select-menu li', text).click();
+    await this.driver.findContent('.test-custom-widget-gallery-widget', text).click();
+    await this.driver.find('.test-custom-widget-gallery-save').click();
     await this.waitForServer();
   }
 

test/gristWebDriverUtils.ts

@@ -14,6 +14,17 @@ import escapeRegExp = require('lodash/escapeRegExp');
 type SectionTypes = 'Table' | 'Card' | 'Card List' | 'Chart' | 'Custom';
 type UserAction = Array<string | number | object | boolean | null | undefined>;
 
+export async function ignoreMissingElementErrors<T>(callback: () => T): Promise<T | undefined> {
+  try {
+    return await callback()
+  } catch (e) {
+    if (e.name === 'NoSuchElementError' || e.name === 'StaleElementReferenceError') {
+      return;
+    }
+    throw e;
+  }
+}
+
 export class GristWebDriverUtils {
   public constructor(public driver: WebDriver) {
   }
@@ -145,7 +156,9 @@ export class GristWebDriverUtils {
     if (options.dismissTips) { await this.dismissBehavioralPrompts(); }
 
     if (tableRe) {
-      const tableEl = driver.findContent('.test-wselect-table', tableRe);
+      const tableEl = driver.findContentWait('.test-wselect-table', tableRe, 2000);
+
+      if (options.dismissTips) { await this.dismissBehavioralPrompts(); }
 
       // unselect all selected columns
       for (const col of (await driver.findAll('.test-wselect-column[class*=-selected]'))) {
@@ -210,8 +223,11 @@ export class GristWebDriverUtils {
     const max = 10;
 
     // Keep dismissing prompts until there are no more, up to a maximum of 10 times.
-    while (i < max && await this.driver.find('.test-behavioral-prompt').isPresent()) {
-      await this.driver.find('.test-behavioral-prompt-dismiss').click();
+    const getButton = () => {
+      return this.driver.find('.test-behavioral-prompt-dismiss')
+    }
+    while (i < max && await getButton().isPresent()) {
+      await ignoreMissingElementErrors(() => getButton().click());
       await this.waitForServer();
       i += 1;
     }

test/inspect.ts

@@ -11,7 +11,7 @@ describe('inspect', function() {
     await grist.toggleSidePanel('right', 'open');
     await grist.addNewSection(/Custom/, /School/, {dismissTips: true});
     await grist.clickWidgetPane();
-    await grist.selectCustomWidget('Inspect Record');
+    await grist.selectCustomWidget('Inspect record');
     await grist.setCustomWidgetAccess('full');
     await grist.waitToPass(async () => {
       const txt = await grist.getCustomWidgetBody();