chore(e2e): use different collection names between tests

Author: gribnoysup

.evergreen/start-atlas-cloud-cluster.sh

@@ -104,11 +104,11 @@ export COMPASS_E2E_ATLAS_CLOUD_SANDBOX_DBUSER_USERNAME="$ATLAS_TEST_DB_USERNAME"
 export COMPASS_E2E_ATLAS_CLOUD_SANDBOX_DBUSER_PASSWORD="$ATLAS_TEST_DB_PASSWORD"
 
 echo "Creating Atlas deployment \`$ATLAS_CLUSTER_NAME\` to test against..."
-atlascli clusters create $ATLAS_CLUSTER_NAME \
+(atlascli clusters create $ATLAS_CLUSTER_NAME \
   --provider AWS \
   --region US_EAST_1 \
   --tier M10 \
-  --type GEOSHARDED
+  --type GEOSHARDED || true) # can error if custom name was provided, will fail on next step if it's not expected failure
 
 echo "Waiting for the deployment to be provisioned..."
 atlascli clusters watch $ATLAS_CLUSTER_NAME

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

@@ -168,13 +168,15 @@ export async function createNumbersStringCollection(
   );
 }
 
-export async function createGeospatialCollection(): Promise<void> {
+export async function createGeospatialCollection(
+  name = 'geospatial'
+): Promise<void> {
   await Promise.all(
     test_dbs.map(async (db) => {
       const lon = () => Math.random() * 360 - 180;
       const lat = () => Math.random() * 180 - 90;
 
-      await db.collection('geospatial').insertMany(
+      await db.collection(name).insertMany(
         [...Array(1000).keys()].map(() => ({
           location: { type: 'Point', coordinates: [lon(), lat()] },
         }))

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

@@ -39,7 +39,7 @@ function buildCommonArgs(yargs: Argv) {
     .option('webdriver-waitfor-timeout', {
       type: 'number',
       description: 'Set a custom default webdriver waitFor timeout',
-      default: 120_000, // webdriver default is 3000ms
+      default: 1000 * 60 * 2, // 2min, webdriver default is 3s
     })
     .option('webdriver-waitfor-interval', {
       type: 'number',

packages/compass-e2e-tests/tests/atlas-cloud/global-writes.test.ts

@@ -1,6 +1,11 @@
 import { expect } from 'chai';
 import type { Compass } from '../../helpers/compass';
-import { cleanup, init, Selectors } from '../../helpers/compass';
+import {
+  cleanup,
+  init,
+  screenshotIfFailed,
+  Selectors,
+} from '../../helpers/compass';
 import type { CompassBrowser } from '../../helpers/compass-browser';
 import { createGeospatialCollection } from '../../helpers/insert-data';
 import {
@@ -15,7 +20,7 @@ type GeoShardingFormData = {
 
 type GeoShardingStatus = 'UNSHARDED' | 'SHARDING' | 'SHARD_KEY_CORRECT';
 
-const WEBDRIVER_TIMEOUT = 1000 * 60 * 20;
+const WEBDRIVER_TIMEOUT = 1000 * 60 * 10;
 const MOCHA_TIMEOUT = WEBDRIVER_TIMEOUT * 1.2;
 
 async function createGeoShardKey(
@@ -44,44 +49,47 @@ async function waitForGlobalWritesStatus(
 ) {
   await browser.waitUntil(
     async () => {
-      const content = await browser.$(
-        Selectors.GlobalWrites.tabStatus(nextStatus)
-      );
-      return await content.isDisplayed();
+      return await browser
+        .$(Selectors.GlobalWrites.tabStatus(nextStatus))
+        .isDisplayed();
     },
     { timeout: WEBDRIVER_TIMEOUT }
   );
 }
 
 describe('Global writes', function () {
+  // Sharding a collection takes a bit longer
+  this.timeout(MOCHA_TIMEOUT);
+
   let compass: Compass;
   let browser: CompassBrowser;
 
-  beforeEach(async function () {
-    // Sharding a collection takes a bit longer
-    this.timeout(MOCHA_TIMEOUT);
-    compass = await init(this.test?.fullTitle());
-    browser = compass.browser;
-    await browser.setupDefaultConnections();
-  });
-
   before(function () {
     if (!isTestingAtlasCloudSandbox()) {
       this.skip();
     }
   });
 
-  after(async function () {
+  beforeEach(async function () {
+    compass = await init(this.test?.fullTitle());
+    browser = compass.browser;
+    await browser.setupDefaultConnections();
+  });
+
+  afterEach(async function () {
+    await screenshotIfFailed(compass, this.currentTest);
     await cleanup(compass);
   });
 
   it('should be able to shard an unsharded namespace and also unmanage it', async function () {
-    await createGeospatialCollection();
+    const collName = `global-writes-geospatial-${Date.now()}`;
+
+    await createGeospatialCollection(collName);
     await browser.connectToDefaults();
     await browser.navigateToCollectionTab(
       DEFAULT_CONNECTION_NAMES[0],
       'test',
-      'geospatial',
+      collName,
       'GlobalWrites'
     );
 
@@ -116,12 +124,14 @@ describe('Global writes', function () {
   });
 
   it('should be able to shard an unsharded namespace and cancel the operation', async function () {
-    await createGeospatialCollection();
+    const collName = `global-writes-geospatial-${Date.now()}`;
+
+    await createGeospatialCollection(collName);
     await browser.connectToDefaults();
     await browser.navigateToCollectionTab(
       DEFAULT_CONNECTION_NAMES[0],
       'test',
-      'geospatial',
+      collName,
       'GlobalWrites'
     );
 

packages/compass-e2e-tests/tests/atlas-cloud/rolling-indexes.test.ts

@@ -30,15 +30,12 @@ describe('Rolling indexes', function () {
 
   afterEach(async function () {
     await screenshotIfFailed(compass, this.currentTest);
-  });
-
-  after(async function () {
     await cleanup(compass);
   });
 
   it('should be able to create, list, and delete rolling indexes', async function () {
     // Building rolling indexes is a slow process
-    const extendedRollingIndexesTimeout = 1000 * 60 * 20;
+    const extendedRollingIndexesTimeout = 1000 * 60 * 10;
 
     this.timeout(extendedRollingIndexesTimeout * 1.2);