Skip to content

Commit efbe499

Browse files
committed
Use serverSatisfies instead of the connection name
1 parent 9c03003 commit efbe499

File tree

3 files changed

+2
-16
lines changed

3 files changed

+2
-16
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import {
22
DEFAULT_CONNECTION_STRING_1,
33
DEFAULT_CONNECTION_NAME_1,
44
connectionNameFromString,
5+
serverSatisfies,
56
} from '../compass';
67
import type { CompassBrowser } from '../compass-browser';
78
import type { ConnectFormState } from '../connect-form-state';
89
import * as Selectors from '../selectors';
910
import Debug from 'debug';
1011
import {
1112
DEFAULT_CONNECTION_NAMES,
12-
isEndOfLifeConnection,
1313
isTestingAtlasCloudExternal,
1414
isTestingAtlasCloudSandbox,
1515
} from '../test-runner-context';
@@ -135,7 +135,7 @@ export async function waitForConnectionResult(
135135
{
136136
connectionStatus = 'success',
137137
timeout,
138-
dismissEndOfLifeModal = isEndOfLifeConnection(connectionName),
138+
dismissEndOfLifeModal = serverSatisfies('<=4.4'),
139139
}: ConnectionResultOptions = {}
140140
): Promise<string | undefined> {
141141
const waitOptions = typeof timeout !== 'undefined' ? { timeout } : undefined;

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import {
22
getConnectionTitle,
33
type ConnectionInfo,
44
} from '@mongodb-js/connection-info';
5-
import { isEndOfLifeVersion } from '@mongodb-js/compass-connections';
65
import type { MongoClusterOptions } from 'mongodb-runner';
76
import yargs from 'yargs';
87
import type { Argv, CamelCase } from 'yargs';
@@ -332,18 +331,6 @@ export function assertTestingAtlasCloudSandbox(
332331
}
333332
}
334333

335-
export function isEndOfLifeConnection(connectionName: string) {
336-
const connectionIndex = DEFAULT_CONNECTION_NAMES.indexOf(connectionName);
337-
const serverInfo = DEFAULT_CONNECTIONS_SERVER_INFO[connectionIndex];
338-
if (!serverInfo) {
339-
debug(
340-
`Unable to find server info for connection named '${connectionName}'`
341-
);
342-
return false;
343-
}
344-
return isEndOfLifeVersion(serverInfo.version);
345-
}
346-
347334
const contextForPrinting = Object.fromEntries(
348335
Object.entries(context).map(([k, v]) => {
349336
return [k, /password/i.test(k) ? '<secret>' : v];

packages/compass-e2e-tests/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
},
3333
"devDependencies": {
3434
"@electron/rebuild": "^3.7.2",
35-
"@mongodb-js/compass-connections": "^1.56.0",
3635
"@mongodb-js/compass-test-server": "^0.3.8",
3736
"@mongodb-js/connection-info": "^0.14.0",
3837
"@mongodb-js/eslint-config-compass": "^1.3.8",

0 commit comments

Comments
 (0)