Dismiss end-of-life modal conditionally on the connection name

Author: kraenhansen

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

@@ -9,6 +9,7 @@ import * as Selectors from '../selectors';
 import Debug from 'debug';
 import {
   DEFAULT_CONNECTION_NAMES,
+  isEndOfLifeConnection,
   isTestingAtlasCloudExternal,
   isTestingAtlasCloudSandbox,
 } from '../test-runner-context';
@@ -33,6 +34,7 @@ export async function getConnectFormConnectionString(
 type ConnectionResultOptions = {
   connectionStatus?: 'success' | 'failure' | 'either';
   timeout?: number;
+  dismissEndOfLifeModal?: boolean;
 };
 
 type ConnectOptions = ConnectionResultOptions & {
@@ -130,7 +132,11 @@ export async function doConnect(
 export async function waitForConnectionResult(
   browser: CompassBrowser,
   connectionName: string,
-  { connectionStatus = 'success', timeout }: ConnectionResultOptions = {}
+  {
+    connectionStatus = 'success',
+    timeout,
+    dismissEndOfLifeModal = isEndOfLifeConnection(connectionName),
+  }: ConnectionResultOptions = {}
 ): Promise<string | undefined> {
   const waitOptions = typeof timeout !== 'undefined' ? { timeout } : undefined;
 
@@ -145,6 +151,14 @@ export async function waitForConnectionResult(
     await browser.setValueVisible(Selectors.SidebarFilterInput, '');
   }
 
+  if (dismissEndOfLifeModal) {
+    await browser.$(Selectors.EndOfLifeConnectionModal).waitForDisplayed();
+    await browser.clickVisible(Selectors.EndOfLifeConnectionModalConfirmButton);
+    await browser
+      .$(Selectors.EndOfLifeConnectionModal)
+      .waitForDisplayed({ reverse: true });
+  }
+
   if (connectionStatus === 'either') {
     // For the very rare cases where we don't care whether it fails or succeeds.
     // Usually because the exact result is a race condition.

packages/compass-e2e-tests/helpers/test-runner-context.ts

@@ -2,6 +2,7 @@ import {
   getConnectionTitle,
   type ConnectionInfo,
 } from '@mongodb-js/connection-info';
+import { isEndOfLifeVersion } from '@mongodb-js/compass-connections';
 import type { MongoClusterOptions } from 'mongodb-runner';
 import yargs from 'yargs';
 import type { Argv, CamelCase } from 'yargs';
@@ -331,6 +332,17 @@ export function assertTestingAtlasCloudSandbox(
   }
 }
 
+export function isEndOfLifeConnection(connectionName: string) {
+  const connectionIndex = DEFAULT_CONNECTION_NAMES.indexOf(connectionName);
+  const serverInfo = DEFAULT_CONNECTIONS_SERVER_INFO[connectionIndex];
+  if (!serverInfo) {
+    throw new Error(
+      `Unable to find server info for connection named '${connectionName}'`
+    );
+  }
+  return isEndOfLifeVersion(serverInfo.version);
+}
+
 const contextForPrinting = Object.fromEntries(
   Object.entries(context).map(([k, v]) => {
     return [k, /password/i.test(k) ? '<secret>' : v];

packages/compass-e2e-tests/package.json

@@ -32,6 +32,7 @@
   },
   "devDependencies": {
     "@electron/rebuild": "^3.7.2",
+    "@mongodb-js/compass-connections": "^1.56.0",
     "@mongodb-js/compass-test-server": "^0.3.8",
     "@mongodb-js/connection-info": "^0.14.0",
     "@mongodb-js/eslint-config-compass": "^1.3.8",