chore(e2e): fix connect button selector

Author: gribnoysup

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

@@ -123,7 +123,7 @@ export async function doConnect(
   connectionName: string,
   options: ConnectionResultOptions = {}
 ) {
-  await browser.clickVisible(Selectors.ConnectButton);
+  await browser.clickVisible(Selectors.ConnectionFormConnectButton);
   await browser.waitForConnectionResult(connectionName, options);
 }
 

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

@@ -61,6 +61,15 @@ export const ConnectionFormErrorMessage =
   '[data-testid="connection-error-summary"]';
 export const CancelConnectionButton =
   '[data-testid="cancel-connection-button"]';
+export const ConnectionFormConnectionName =
+  '[data-testid="personalization-name-input"]';
+export const ConnectionFormConnectionColor =
+  '[data-testid="personalization-color-input"]';
+export const ConnectionFormFavoriteCheckbox =
+  '[data-testid="personalization-favorite-checkbox"]';
+export const ConnectionFormConnectButton = '[data-testid="connect-button"]';
+export const ConnectionFormSaveAndConnectButton =
+  '[data-testid="save-and-connect-button"]';
 
 export const AdvancedOptionsTabs = '[aria-label="Advanced Options Tabs"]';
 export const SelectedAdvancedOptionsTab = `${AdvancedOptionsTabs} [aria-selected="true"]`;
@@ -223,12 +232,8 @@ export const ConnectionModalTitle = `${ConnectionModal} h3`;
 export const ConnectionModalCloseButton = `${ConnectionModal} [aria-label="Close modal"]`;
 export const ConnectionModalConnectButton = '[data-testid="connect-button"]';
 export const ConnectionModalSaveButton = '[data-testid="save-button"]';
-export const ConnectionFormConnectionName =
-  '[data-testid="personalization-name-input"]';
-export const ConnectionFormConnectionColor =
-  '[data-testid="personalization-color-input"]';
-export const ConnectionFormFavoriteCheckbox =
-  '[data-testid="personalization-favorite-checkbox"]';
+
+// Connection process toast
 export const connectionToastById = (connectionId: string) => {
   return `[data-testid="toast-connection-status--${connectionId}"]`;
 };
@@ -238,7 +243,6 @@ export const ConnectionToastErrorReviewButton =
 
 // Connections sidebar
 export const ConnectionsTitle = '[data-testid="connections-header"]';
-export const ConnectButton = '[data-action="connection-connect"]';
 export const SidebarNewConnectionButton = '[data-action="add-new-connection"]';
 export const ConnectionMenu = '[data-testid="sidebar-navigation-item-actions"]';
 export const CreateDatabaseButton =
@@ -356,7 +360,9 @@ export const sidebarConnection = (connectionName: string): string => {
 };
 
 export const sidebarConnectionButton = (connectionName: string): string => {
-  return `${sidebarConnection(connectionName)} ${ConnectButton}`;
+  return `${sidebarConnection(
+    connectionName
+  )} [data-action="connection-connect"]`;
 };
 
 export const sidebarConnectionActionButton = (

packages/compass-e2e-tests/tests/oidc.test.ts

@@ -264,7 +264,7 @@ describe('OIDC integration', function () {
       connectionString
     );
 
-    await browser.clickVisible(Selectors.ConnectButton);
+    await browser.clickVisible(Selectors.ConnectionFormConnectButton);
     await once(emitter, 'authorizeEndpointCalled');
 
     overrideRequestHandler = () => {};
@@ -319,7 +319,7 @@ describe('OIDC integration', function () {
       Selectors.ConnectionFormStringInput,
       connectionString
     );
-    await browser.clickVisible(Selectors.ConnectButton);
+    await browser.clickVisible(Selectors.ConnectionFormConnectButton);
 
     // wait for the token to expire (see expires_in above)
     await browser.pause(10_000);
@@ -364,7 +364,7 @@ describe('OIDC integration', function () {
       Selectors.ConnectionFormStringInput,
       connectionString
     );
-    await browser.clickVisible(Selectors.ConnectButton);
+    await browser.clickVisible(Selectors.ConnectionFormConnectButton);
 
     // wait for the token to expire (see expires_in above)
     await browser.pause(10_000);