comments

Author: syn-zhu

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

@@ -8,6 +8,7 @@ import {
   DEFAULT_CONNECTION_NAME_2,
   DEFAULT_CONNECTION_STRING_1,
   DEFAULT_CONNECTION_STRING_2,
+  TEST_ATLAS_CLOUD_EXTERNAL_URL,
   TEST_MULTIPLE_CONNECTIONS,
 } from '../compass';
 import Debug from 'debug';
@@ -986,6 +987,12 @@ export async function setupDefaultConnections(browser: CompassBrowser) {
   whereas we do have some tests that try and use those. We can easily change
   this in future if needed, though.
   */
+
+  // no need to setup connections if we are running against Atlas
+  if (!TEST_ATLAS_CLOUD_EXTERNAL_URL) {
+    return;
+  }
+
   for (const connectionName of [
     DEFAULT_CONNECTION_NAME_1,
     DEFAULT_CONNECTION_NAME_2,

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

@@ -46,8 +46,10 @@ let MONGODB_USE_ENTERPRISE =
 
 // should we test compass-web (true) or compass electron (false)?
 export const TEST_COMPASS_WEB = process.argv.includes('--test-compass-web');
-export const ATLAS_DOMAIN = process.env.ATLAS_DOMAIN;
-export const ATLAS_GROUP_ID = process.env.ATLAS_GROUP_ID;
+export const TEST_ATLAS_CLOUD_EXTERNAL_URL =
+  process.env.TEST_ATLAS_CLOUD_EXTERNAL_URL;
+export const TEST_ATLAS_CLOUD_EXTERNAL_GROUP_ID =
+  process.env.TEST_ATLAS_CLOUD_EXTERNAL_GROUP_ID;
 // multiple connections is now the default
 export const TEST_MULTIPLE_CONNECTIONS = true;
 
@@ -78,21 +80,21 @@ export const MONGODB_TEST_SERVER_PORT = Number(
 );
 
 export const DEFAULT_CONNECTION_STRING_1 =
-  process.env.CONNECTION_STRING_1 ||
+  process.env.TEST_ATLAS_CLOUD_EXTERNAL_CONNECTION_STRING_1 ||
   `mongodb://127.0.0.1:${MONGODB_TEST_SERVER_PORT}/test`;
 // NOTE: in browser.setupDefaultConnections() we don't give the first connection an
 // explicit name, so it gets a calculated one based off the connection string
 export const DEFAULT_CONNECTION_NAME_1 =
-  process.env.CONNECTION_NAME_1 ||
+  process.env.TEST_ATLAS_CLOUD_EXTERNAL_CONNECTION_NAME_1 ||
   connectionNameFromString(DEFAULT_CONNECTION_STRING_1);
 
 // for testing multiple connections
 export const DEFAULT_CONNECTION_STRING_2 =
-  process.env.CONNECTION_STRING_2 ||
+  process.env.TEST_ATLAS_CLOUD_EXTERNAL_CONNECTION_STRING_2 ||
   `mongodb://127.0.0.1:${MONGODB_TEST_SERVER_PORT + 1}/test`;
 // NOTE: in browser.setupDefaultConnections() the second connection gets given an explicit name
 export const DEFAULT_CONNECTION_NAME_2 =
-  process.env.CONNECTION_NAME_2 || 'connection-2';
+  process.env.TEST_ATLAS_CLOUD_EXTERNAL_CONNECTION_NAME_2 || 'connection-2';
 
 export function updateMongoDBServerInfo() {
   try {
@@ -111,7 +113,7 @@ export function updateMongoDBServerInfo() {
         'server-info',
         '--',
         '--connectionString',
-        process.env.CONNECTION_STRING_1 ||
+        process.env.TEST_ATLAS_CLOUD_EXTERNAL_CONNECTION_STRING_1 ||
           `mongodb://127.0.0.1:${String(MONGODB_TEST_SERVER_PORT)}`,
       ],
       { encoding: 'utf-8' }
@@ -767,6 +769,16 @@ async function startCompassElectron(
   return compass;
 }
 
+export type StoredAtlasCloudCookies = {
+  name: string;
+  value: string;
+  domain: string;
+  path: string;
+  secure: boolean;
+  httpOnly: boolean;
+  expirationDate: number;
+}[];
+
 export async function startBrowser(
   name: string,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -794,17 +806,19 @@ export async function startBrowser(
     ...wdioOptions,
   })) as CompassBrowser;
 
-  if (ATLAS_DOMAIN) {
+  if (TEST_ATLAS_CLOUD_EXTERNAL_URL) {
     // Navigate to a 404 page to set cookies
-    await browser.navigateTo(`https://${ATLAS_DOMAIN}/404`);
+    await browser.navigateTo(`https://${TEST_ATLAS_CLOUD_EXTERNAL_URL}/404`);
 
     const cookiesFile = process.env.COOKIES_FILE;
     if (!cookiesFile) {
       throw new Error(
         'ATLAS_DOMAIN is set but COOKIES_FILE is not. Please set COOKIES_FILE to the path of the cookies file.'
       );
     }
-    const cookies = JSON.parse(await fs.readFile(cookiesFile, 'utf8'));
+    const cookies: StoredAtlasCloudCookies = JSON.parse(
+      await fs.readFile(cookiesFile, 'utf8')
+    );
 
     for (const cookie of cookies) {
       if (
@@ -824,7 +838,7 @@ export async function startBrowser(
     }
 
     await browser.navigateTo(
-      `https://${ATLAS_DOMAIN}/v2/${ATLAS_GROUP_ID}#/explorer`
+      `https://${TEST_ATLAS_CLOUD_EXTERNAL_URL}/v2/${TEST_ATLAS_CLOUD_EXTERNAL_GROUP_ID}#/explorer`
     );
   } else {
     await browser.navigateTo('http://localhost:7777/');

packages/compass-e2e-tests/index.ts

@@ -18,7 +18,7 @@ import {
   LOG_PATH,
   removeUserDataDir,
   updateMongoDBServerInfo,
-  ATLAS_DOMAIN,
+  TEST_ATLAS_CLOUD_EXTERNAL_URL,
 } from './helpers/compass';
 import ResultLogger from './helpers/result-logger';
 
@@ -61,7 +61,7 @@ async function setup() {
   const disableStartStop = process.argv.includes('--disable-start-stop');
   const shouldTestCompassWeb = process.argv.includes('--test-compass-web');
 
-  if (!ATLAS_DOMAIN) {
+  if (!TEST_ATLAS_CLOUD_EXTERNAL_URL) {
     // When working on the tests it is faster to just keep the server running.
     if (!disableStartStop) {
       debug('Starting MongoDB server');
@@ -142,7 +142,7 @@ function cleanup() {
   const disableStartStop = process.argv.includes('--disable-start-stop');
   const shouldTestCompassWeb = process.argv.includes('--test-compass-web');
 
-  if (!ATLAS_DOMAIN) {
+  if (!TEST_ATLAS_CLOUD_EXTERNAL_URL) {
     if (!disableStartStop) {
       if (shouldTestCompassWeb) {
         debug('Stopping compass-web');

packages/compass-e2e-tests/tests/collection-rename.test.ts

@@ -6,7 +6,6 @@ import {
   screenshotIfFailed,
   TEST_COMPASS_WEB,
   DEFAULT_CONNECTION_NAME_1,
-  ATLAS_DOMAIN,
 } from '../helpers/compass';
 import type { CompassBrowser } from '../helpers/compass-browser';
 import { createDummyCollections } from '../helpers/insert-data';
@@ -85,10 +84,7 @@ describe('Collection Rename Modal', () => {
   before(async function () {
     compass = await init(this.test?.fullTitle());
     browser = compass.browser;
-    // no need to setup connections if we are running against Atlas
-    if (!ATLAS_DOMAIN) {
-      await browser.setupDefaultConnections();
-    }
+    await browser.setupDefaultConnections();
   });
 
   beforeEach(async function () {