File tree Expand file tree Collapse file tree 3 files changed +2
-16
lines changed
packages/compass-e2e-tests Expand file tree Collapse file tree 3 files changed +2
-16
lines changed Original file line number Diff line number Diff line change @@ -2,14 +2,14 @@ import {
22 DEFAULT_CONNECTION_STRING_1 ,
33 DEFAULT_CONNECTION_NAME_1 ,
44 connectionNameFromString ,
5+ serverSatisfies ,
56} from '../compass' ;
67import type { CompassBrowser } from '../compass-browser' ;
78import type { ConnectFormState } from '../connect-form-state' ;
89import * as Selectors from '../selectors' ;
910import Debug from 'debug' ;
1011import {
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 ;
Original file line number Diff line number Diff line change 22 getConnectionTitle ,
33 type ConnectionInfo ,
44} from '@mongodb-js/connection-info' ;
5- import { isEndOfLifeVersion } from '@mongodb-js/compass-connections' ;
65import type { MongoClusterOptions } from 'mongodb-runner' ;
76import yargs from 'yargs' ;
87import 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-
347334const contextForPrinting = Object . fromEntries (
348335 Object . entries ( context ) . map ( ( [ k , v ] ) => {
349336 return [ k , / p a s s w o r d / i. test ( k ) ? '<secret>' : v ] ;
Original file line number Diff line number Diff line change 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" ,
You can’t perform that action at this time.
0 commit comments