chore(e2e): add connectionName support to more helpers COMPASS-8002

packages/compass-e2e-tests/helpers/commands/collection-workspaces.ts

@@ -1,9 +1,10 @@
+import { TEST_MULTIPLE_CONNECTIONS } from '../compass';
 import type { CompassBrowser } from '../compass-browser';
 import * as Selectors from '../selectors';
 
 async function navigateToCollection(
   browser: CompassBrowser,
-  // TODO(COMPASS-8002): take connectionName into account
+  connectionName: string,
   dbName: string,
   collectionName: string,
 
@@ -12,7 +13,12 @@ async function navigateToCollection(
   // state of Schema, and Validation tabs without re-connecting.
   closeExistingTabs = true
 ): Promise<void> {
+  const connectionId = TEST_MULTIPLE_CONNECTIONS
+    ? await browser.getConnectionIdByName(connectionName)
+    : undefined;
+
   const collectionSelector = Selectors.sidebarCollection(
+    connectionId,
     dbName,
     collectionName
   );
@@ -30,12 +36,17 @@ async function navigateToCollection(
 
   // click it and wait for the collection header to become visible
   await browser.clickVisible(collectionSelector);
-  await waitUntilActiveCollectionTab(browser, dbName, collectionName);
+  await waitUntilActiveCollectionTab(
+    browser,
+    connectionName,
+    dbName,
+    collectionName
+  );
 }
 
 export async function navigateToCollectionTab(
   browser: CompassBrowser,
-  // TODO(COMPASS-8002): take connectionName into account
+  connectionName: string,
   dbName: string,
   collectionName: string,
   tabName:
@@ -48,6 +59,7 @@ export async function navigateToCollectionTab(
 ): Promise<void> {
   await navigateToCollection(
     browser,
+    connectionName,
     dbName,
     collectionName,
     closeExistingTabs
@@ -57,7 +69,6 @@ export async function navigateToCollectionTab(
 
 export async function navigateWithinCurrentCollectionTabs(
   browser: CompassBrowser,
-  // TODO(COMPASS-8002): take connectionName into account
   tabName:
     | 'Documents'
     | 'Aggregations'
@@ -77,9 +88,9 @@ export async function navigateWithinCurrentCollectionTabs(
   await waitUntilActiveCollectionSubTab(browser, tabName);
 }
 
-export async function waitUntilActiveCollectionTab(
+async function waitUntilActiveCollectionTab(
   browser: CompassBrowser,
-  // TODO(COMPASS-8002): take connectionName into account
+  connectionName: string,
   dbName: string,
   collectionName: string,
   tabName:
@@ -91,7 +102,13 @@ export async function waitUntilActiveCollectionTab(
     | null = null
 ) {
   await browser
-    .$(Selectors.collectionWorkspaceTab(`${dbName}.${collectionName}`, true))
+    .$(
+      Selectors.workspaceTab({
+        connectionName,
+        namespace: `${dbName}.${collectionName}`,
+        active: true,
+      })
+    )
     .waitForDisplayed();
   if (tabName) {
     await waitUntilActiveCollectionSubTab(browser, tabName);
@@ -100,7 +117,6 @@ export async function waitUntilActiveCollectionTab(
 
 export async function waitUntilActiveCollectionSubTab(
   browser: CompassBrowser,
-  // TODO(COMPASS-8002): take connectionName into account
   tabName:
     | 'Documents'
     | 'Aggregations'

packages/compass-e2e-tests/helpers/commands/connection-workspaces.ts

@@ -1,6 +1,7 @@
 import { TEST_MULTIPLE_CONNECTIONS } from '../compass';
 import type { CompassBrowser } from '../compass-browser';
 import * as Selectors from '../selectors';
+import type { WorkspaceTabSelectorOptions } from '../selectors';
 
 export async function navigateToConnectionTab(
   browser: CompassBrowser,
@@ -30,8 +31,13 @@ export async function waitUntilActiveConnectionTab(
   connectionName: string,
   tabName: 'Performance' | 'Databases'
 ) {
-  // TODO(COMPASS-8002): we should differentiate by connectionName somehow
-  await browser
-    .$(Selectors.connectionWorkspaceTab(tabName, true))
-    .waitForDisplayed();
+  const options: WorkspaceTabSelectorOptions = { title: tabName, active: true };
+
+  // Only add the connectionName for multiple connections because for some
+  // reason this sometimes flakes in single connections even though the tab is
+  // definitely there in the screenshot.
+  if (TEST_MULTIPLE_CONNECTIONS) {
+    options.connectionName = connectionName;
+  }
+  await browser.$(Selectors.workspaceTab(options)).waitForDisplayed();
 }

packages/compass-e2e-tests/helpers/commands/database-workspaces.ts

@@ -1,5 +1,7 @@
+import { TEST_MULTIPLE_CONNECTIONS } from '../compass';
 import type { CompassBrowser } from '../compass-browser';
 import * as Selectors from '../selectors';
+import type { WorkspaceTabSelectorOptions } from '../selectors';
 
 export async function navigateToDatabaseCollectionsTab(
   browser: CompassBrowser,
@@ -16,8 +18,14 @@ export async function waitUntilActiveDatabaseTab(
   connectionName: string,
   dbName: string
 ) {
-  // TODO(COMPASS-8002): check that the connectionName matches too
-  await browser
-    .$(Selectors.databaseWorkspaceTab(dbName, true))
-    .waitForDisplayed();
+  const options: WorkspaceTabSelectorOptions = { title: dbName, active: true };
+
+  // Only add the connectionName for multiple connections because for some
+  // reason this sometimes flakes in single connections even though the tab is
+  // definitely there in the screenshot.
+  if (TEST_MULTIPLE_CONNECTIONS) {
+    options.connectionName = connectionName;
+  }
+
+  await browser.$(Selectors.workspaceTab(options)).waitForDisplayed();
 }

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

@@ -65,9 +65,13 @@ export async function disconnectAll(
       // toast by now. If so, just close it otherwise the next test or connection
       // attempt will be confused by it.
       if (await browser.$(Selectors.LGToastCloseButton).isExisting()) {
-        const toastText = await browser.$('#lg-toast-region').getText();
-        debug('Closing toast', toastText);
-        await browser.clickVisible(Selectors.LGToastCloseButton);
+        try {
+          const toastText = await browser.$('#lg-toast-region').getText();
+          debug('Closing toast', toastText);
+          await browser.clickVisible(Selectors.LGToastCloseButton);
+        } catch (error) {
+          debug('ignoring', error);
+        }
       }
     }
 

packages/compass-e2e-tests/helpers/commands/drop-collection-from-sidebar.ts

@@ -1,19 +1,28 @@
+import { TEST_MULTIPLE_CONNECTIONS } from '../compass';
 import type { CompassBrowser } from '../compass-browser';
 import * as Selectors from '../selectors';
 
 export async function dropCollectionFromSidebar(
   browser: CompassBrowser,
+  connectionName: string,
   dbName: string,
   collectionName: string
 ): Promise<void> {
+  const connectionId = TEST_MULTIPLE_CONNECTIONS
+    ? await browser.getConnectionIdByName(connectionName)
+    : undefined;
+
   // search for the collecton in the sidebar filter
   await browser.clickVisible(Selectors.SidebarFilterInput);
   await browser.setValueVisible(Selectors.SidebarFilterInput, collectionName);
-  const dbElement = await browser.$(Selectors.sidebarDatabase(dbName));
+  const dbElement = await browser.$(
+    Selectors.sidebarDatabase(connectionId, dbName)
+  );
   await dbElement.waitForDisplayed();
 
   // wait for the collection to become displayed
   const collectionSelector = Selectors.sidebarCollection(
+    connectionId,
     dbName,
     collectionName
   );

packages/compass-e2e-tests/helpers/commands/drop-database-from-sidebar.ts

@@ -1,24 +1,32 @@
+import { TEST_MULTIPLE_CONNECTIONS } from '../compass';
 import type { CompassBrowser } from '../compass-browser';
 import * as Selectors from '../selectors';
 
 export async function dropDatabaseFromSidebar(
   browser: CompassBrowser,
+  connectionName: string,
   dbName: string
 ): Promise<void> {
+  const connectionId = TEST_MULTIPLE_CONNECTIONS
+    ? await browser.getConnectionIdByName(connectionName)
+    : undefined;
+
   // search for the database in the sidebar filter
   await browser.clickVisible(Selectors.SidebarFilterInput);
   await browser.setValueVisible(Selectors.SidebarFilterInput, dbName);
-  await browser.$(Selectors.sidebarDatabase(dbName)).waitForDisplayed();
+  await browser
+    .$(Selectors.sidebarDatabase(connectionId, dbName))
+    .waitForDisplayed();
 
   // open the drop database modal from the sidebar
-  await browser.hover(Selectors.sidebarDatabase(dbName));
+  await browser.hover(Selectors.sidebarDatabase(connectionId, dbName));
 
   await browser.clickVisible(Selectors.DropDatabaseButton);
 
   await browser.dropNamespace(dbName);
 
   // wait for it to be gone
   await browser
-    .$(Selectors.sidebarDatabase(dbName))
+    .$(Selectors.sidebarDatabase(connectionId, dbName))
     .waitForExist({ reverse: true });
 }

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

@@ -41,8 +41,7 @@ export * from './get-feature';
 export * from './set-feature';
 export * from './save-favorite';
 export * from './save-connection-string-as-favorite';
-export * from './select-connection';
-export * from './select-connection-menu-item';
+export * from './sidebar-connection';
 export * from './select-connections-menu-item';
 export * from './open-settings-modal';
 export * from './wait-for-connection-result';
@@ -67,4 +66,3 @@ export * from './drop-index';
 export * from './hide-index';
 export * from './unhide-index';
 export * from './hide-visible-toasts';
-export * from './remove-connection';