Merge remote-tracking branch 'origin/main' into beta-releases

Author: github-actions[bot]

package-lock.json

@@ -48,11 +48,7 @@ async function resetForDisconnect(
     closeToasts?: boolean;
   } = {}
 ) {
-  if (await browser.$(Selectors.LGModal).isDisplayed()) {
-    // close any modals that might be in the way
-    await browser.clickVisible(Selectors.LGModalClose);
-    await browser.$(Selectors.LGModal).waitForDisplayed({ reverse: true });
-  }
+  await browser.hideVisibleModal();
 
   // Collapse all the connections so that they will all hopefully fit on screen
   // and therefore be rendered.

packages/compass-e2e-tests/helpers/commands/disconnect.ts

@@ -0,0 +1,24 @@
+import type { CompassBrowser } from '../compass-browser';
+import * as Selectors from '../selectors';
+
+import Debug from 'debug';
+
+const debug = Debug('compass-e2e-tests');
+
+export async function hideVisibleModal(browser: CompassBrowser): Promise<void> {
+  // If there's some race condition where something else is closing the modal at
+  // the same time we're trying to close the modal, then make it error out
+  // quickly so it can be ignored and we move on.
+
+  if (await browser.$(Selectors.LGModal).isDisplayed()) {
+    // close any modals that might be in the way
+    const waitOptions = { timeout: 2_000 };
+    try {
+      await browser.clickVisible(Selectors.LGModalClose, waitOptions);
+      await browser.$(Selectors.LGModal).waitForDisplayed({ reverse: true });
+    } catch (err) {
+      // if the modal disappears by itself in the meantime, that's fine
+      debug('ignoring', err);
+    }
+  }
+}

packages/compass-e2e-tests/helpers/commands/hide-visible-modal.ts

@@ -59,5 +59,6 @@ export * from './create-index';
 export * from './drop-index';
 export * from './hide-index';
 export * from './unhide-index';
+export * from './hide-visible-modal';
 export * from './hide-visible-toasts';
 export * from './sidebar-collection';

packages/compass-e2e-tests/helpers/commands/index.ts

@@ -3,11 +3,7 @@ import type { CompassBrowser } from '../compass-browser';
 import * as Selectors from '../selectors';
 
 async function resetForRemove(browser: CompassBrowser) {
-  if (await browser.$(Selectors.LGModal).isDisplayed()) {
-    // close any modals that might be in the way
-    await browser.clickVisible(Selectors.LGModalClose);
-    await browser.$(Selectors.LGModal).waitForDisplayed({ reverse: true });
-  }
+  await browser.hideVisibleModal();
 
   // Collapse all the connections so that they will all hopefully fit on screen
   // and therefore be rendered.

packages/compass-e2e-tests/helpers/commands/remove-connections.ts

@@ -46,7 +46,7 @@
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "mongodb-js-cli": "^0.0.3",
-    "node-abi": "^3.65.0",
+    "node-abi": "^3.67.0",
     "normalize-package-data": "^2.3.5",
     "parse-github-repo-url": "^1.3.0",
     "semver": "^7.6.2",