@camunda/e2e-test-suite 0.0.1440 → 0.0.1441

package/dist/pages/8.7/ClusterDetailsPage.js

@@ -458,6 +458,20 @@ class ClusterDetailsPage {
         return variables;
     }
     async createAPIClient(name) {
+        // The clients table paginates 10 rows per page in no particular order, so
+        // once an org holds more than 10 clients the new one is usually not on
+        // page 1 and the scopes assertion below never finds its row. Filter the
+        // table by the client name up front (the search box only renders once
+        // the cluster has at least one client).
+        const clientSearch = this.page.getByRole('searchbox', { name: 'Search' });
+        await this.createFirstClientButton
+            .or(this.createNewClientButton)
+            .first()
+            .waitFor({ state: 'visible', timeout: 60000 })
+            .catch(() => { });
+        if (await clientSearch.isVisible().catch(() => false)) {
+            await clientSearch.fill(name);
+        }
         await this.clickCreateClientButton();
         await (0, test_1.expect)(this.createClientCredentialsDialog).toBeVisible();
         await this.fillAPIClientName(name);

package/dist/pages/8.7/ClusterSecretsPage.d.ts

@@ -15,7 +15,7 @@ declare class ClusterSecretsPage {
     readonly clusterSecretTab: Locator;
     readonly confirmDeleteInput: Locator;
     constructor(page: Page);
-    deleteConnectorSecretsIfExist(): Promise<void>;
+    deleteConnectorSecretsIfExist(keys?: string[]): Promise<void>;
     private dismissOpenModal;
     clickCreateNewSecretButton(clusterName: string): Promise<void>;
     clickClusterBanner(): Promise<void>;

package/dist/pages/8.7/ClusterSecretsPage.js

@@ -31,12 +31,8 @@ class ClusterSecretsPage {
         this.connectorSecretsTable = page.getByRole('table', {
             name: 'Connector secrets',
         });
-        // Legacy Carbon table: an "Options" cell holding the kebab. Hub's
-        // design-system data table instead labels each row's kebab
-        // "Row actions" (data-slot="data-table-actions-trigger"), with no
-        // "Options" cell -- so the old locator found nothing, the pre-clean
-        // returned early, and re-creating an existing secret failed with
-        // "Secret names must be unique".
+        // Console's secrets table moved off Carbon: the per-row overflow menu is
+        // labelled "Row actions" instead of living in an "Options" cell.
         this.optionsButton = page
             .getByRole('cell', { name: 'Options' })
             .getByRole('button')
@@ -81,7 +77,10 @@ class ClusterSecretsPage {
             name: 'Type the word DELETE to confirm',
         });
     }
-    async deleteConnectorSecretsIfExist() {
+    // Pass `keys` to delete only those secrets. Without it every deletable
+    // secret on the cluster is removed, which also wipes the secrets a
+    // concurrent run of a secrets flow on the same cluster has just created.
+    async deleteConnectorSecretsIfExist(keys) {
         try {
             await (0, test_1.expect)(this.optionsButton.first()).toBeVisible({
                 timeout: 10000,
@@ -90,9 +89,17 @@ class ClusterSecretsPage {
         catch (error) {
             return; //No Connector Secrets found in the list
         }
+        const secretRows = keys
+            ? this.page.getByRole('row').filter({
+                has: this.page.getByRole('cell', {
+                    name: new RegExp(`^(${keys.join('|')})$`),
+                }),
+            })
+            : this.page.getByRole('row');
+        const rowOptionsButtons = secretRows.locator(this.optionsButton);
         try {
             for (let sweep = 0; sweep < 20; sweep++) {
-                const options = await this.optionsButton.all();
+                const options = await rowOptionsButtons.all();
                 if (options.length === 0) {
                     break;
                 }
@@ -129,8 +136,7 @@ class ClusterSecretsPage {
             // buttons at once (strict mode violation) while asserting something that
             // is no longer true. The post-condition this helper actually owns is
             // that nothing *deletable* is left behind.
-            const deletableSecretRows = this.page
-                .getByRole('row')
+            const deletableSecretRows = secretRows
                 .filter({ has: this.optionsButton })
                 .filter({ hasNotText: 'CAMUNDA_PROVIDED_' });
             await (0, test_1.expect)(deletableSecretRows).toHaveCount(0, { timeout: 30000 });
@@ -148,7 +154,8 @@ class ClusterSecretsPage {
     // Closes whichever Carbon modal is currently on screen, and waits for it to
     // actually leave the DOM rather than assuming a fixed delay.
     async dismissOpenModal() {
-        const openModal = this.page.locator('.cds--modal.is-visible');
+        // Carbon modals (.cds--modal) and the Radix dialogs Console renders now.
+        const openModal = this.page.locator('.cds--modal.is-visible, [role="dialog"][data-state="open"]');
         if ((await openModal.count().catch(() => 0)) === 0) {
             return;
         }
@@ -201,6 +208,18 @@ class ClusterSecretsPage {
         await (0, test_1.expect)(this.page.getByText('Creating...')).not.toBeVisible({
             timeout: 60000,
         });
+        // Console can answer a create right after deleteConnectorSecretsIfExist()
+        // with "Secret names must be unique". The dialog then stays open and its
+        // overlay blocks every later click, so resubmit until the key is accepted
+        // and the dialog closes. This cannot resolve a key that a concurrent run
+        // of this flow on the same cluster really does hold.
+        const uniqueNameError = this.dialog.getByText('Secret names must be unique');
+        await (0, test_1.expect)(async () => {
+            if (await uniqueNameError.isVisible()) {
+                await this.clickCreateButton();
+            }
+            await (0, test_1.expect)(this.dialog).toBeHidden({ timeout: 5000 });
+        }).toPass({ timeout: 120000, intervals: [5000] });
     }
     async clickKeyInput() {
         await this.keyInput.click();

package/dist/pages/8.7/ConnectorMarketplacePage.d.ts

@@ -10,6 +10,8 @@ declare class ConnectorMarketplacePage {
     readonly tryAgainButton: Locator;
     readonly checkFailedAlert: Locator;
     readonly closeButton: Locator;
+    readonly addRemainingElementsButton: Locator;
+    readonly alreadyAddedStatus: Locator;
     readonly browseAllMarketplaceDetailsButton: Locator;
     constructor(page: Page);
     clickSearchForConnectorTextbox(): Promise<void>;

package/dist/pages/8.7/ConnectorMarketplacePage.js

@@ -13,6 +13,8 @@ class ConnectorMarketplacePage {
     tryAgainButton;
     checkFailedAlert;
     closeButton;
+    addRemainingElementsButton;
+    alreadyAddedStatus;
     browseAllMarketplaceDetailsButton;
     constructor(page) {
         this.page = page;
@@ -40,11 +42,16 @@ class ConnectorMarketplacePage {
             name: 'Add to project',
         });
         this.cancelButton = page.getByRole('button', { name: 'Cancel' });
-        this.tryAgainButton = page.getByRole('button', { name: 'Try again' });
         this.checkFailedAlert = page
             .getByText("Couldn't check this connector")
             .first();
         this.closeButton = page.getByRole('button', { name: 'Close' });
+        const marketplaceDetailFooter = page.locator('[data-test="marketplace-detail-footer"]');
+        this.addRemainingElementsButton = marketplaceDetailFooter.getByRole('button', { name: 'Add remaining elements' });
+        this.tryAgainButton = page.getByRole('button', { name: 'Try again' });
+        this.alreadyAddedStatus = marketplaceDetailFooter
+            .getByRole('status')
+            .filter({ hasText: 'Added to this project' });
     }
     async clickSearchForConnectorTextbox() {
         await this.searchForConnectorTextbox.click({ timeout: 60000 });
@@ -79,24 +86,18 @@ class ConnectorMarketplacePage {
         // immediate isVisible() probes below, which would just repeat the same
         // race this wait exists to close.
         //
-        // The Browse all review step first "checks this project" (camunda-hub
-        // marketplace-connector-detail-state.ts), which waits on the project's
-        // element-template metadata request -- nightly and live traces show that
-        // request still pending 30s in. When the check fails the footer offers
-        // "Try again" (RETRY_INSPECTION) instead of "Add to project", so give the
-        // check longer and re-run it on failure rather than timing out.
-        //
-        // Hub retries a transient (5xx) check once by itself before it shows
-        // "Try again" (use-marketplace-connector-inspection.ts), and the gateway
-        // only answers a hung metadata request with a 504 after ~60s -- so
-        // "Try again" first renders ~121s after the click. A 120s wait expired
-        // ~1s before that and never reached the retry below; allow both attempts.
-        // A "Try again" check keeps the button on screen (loading) and hides the
-        // "Couldn't check" alert until it fails again, so wait on that alert
-        // rather than the button to retry as soon as a check has failed.
+        // Browse all's details panel (camunda-hub MarketplaceConnectorDetails)
+        // renders no action button at all once the connector is already in the
+        // project -- only an "Added to this project" footer status. Every run of
+        // these flows shares the Cross Component Test Project, so after the first
+        // run adds REST Connector the old wait for a button always timed out. A
+        // partially added connector offers "Add remaining elements", and a failed
+        // project check offers "Try again" -- click it and wait again.
         const outcome = this.addToProjectButton
+            .or(this.addRemainingElementsButton)
             .or(this.replaceResourceButton)
             .or(this.cancelButton)
+            .or(this.alreadyAddedStatus)
             .first();
         for (let attempt = 0; attempt < 4; attempt++) {
             await outcome
@@ -116,15 +117,25 @@ class ConnectorMarketplacePage {
         // the old code only handled "Replace resource", so a first-time download
         // (the SaaS nightly always runs in a fresh project) was never confirmed
         // and the connector never reached the diagram. The wait above already
-        // confirmed one of the three is visible, so these are immediate checks.
+        // confirmed one of the outcomes is visible, so these are immediate checks.
         if (await this.addToProjectButton.isVisible()) {
             await this.addToProjectButton.click({ timeout: 10000 });
             imported = true;
         }
+        else if (await this.addRemainingElementsButton.isVisible()) {
+            await this.addRemainingElementsButton.click({ timeout: 10000 });
+            imported = true;
+        }
         else if (await this.replaceResourceButton.isVisible()) {
             await this.replaceResourceButton.click({ timeout: 10000 });
             imported = true;
         }
+        else if (await this.alreadyAddedStatus.isVisible()) {
+            // Nothing to import; close the dialog so it does not cover the canvas.
+            if (await this.closeButton.isVisible()) {
+                await this.closeButton.click({ timeout: 10000 });
+            }
+        }
         else if (await this.cancelButton.isVisible()) {
             await this.cancelButton.click({ timeout: 10000 });
         }

package/dist/tests/8.7/connectors-user-flows.spec.js

@@ -163,27 +163,38 @@ _8_7_1.test.describe('Connectors User Flow Tests', () => {
     (0, _8_7_1.test)('Connector Secrets User Flow - GCP', async ({ page, homePage, modelerHomePage, appsPage, modelerCreatePage, connectorSettingsPage, clusterPage, clusterSecretsPage, }) => {
         _8_7_1.test.slow();
         const processName = 'REST_Connector_Process' + (await (0, _setup_1.generateRandomStringAsync)(3));
+        // Per-run secret keys: concurrent runs of this flow share "Test Cluster",
+        // so fixed keys made one run's create fail with "Secret names must be
+        // unique" and its cleanup delete the secrets another run's instance was
+        // about to resolve.
+        const secretSuffix = await (0, _setup_1.generateRandomStringAsync)(6);
+        const endpointUrlKey = `endpoint_url_${secretSuffix}`;
+        const usernameKey = `username_${secretSuffix}`;
+        const passwordKey = `password_${secretSuffix}`;
         await _8_7_1.test.step('Navigate to Cluster Secrets', async () => {
             await homePage.clickClusters();
             await clusterPage.clickClusterLink(defaultClusterName);
             await clusterPage.clickConnectorSecretesTab(defaultClusterName);
         });
         await _8_7_1.test.step('Delete Connector Secrets If Exist', async () => {
-            await clusterSecretsPage.deleteConnectorSecretsIfExist();
+            await clusterSecretsPage.deleteConnectorSecretsIfExist([
+                endpointUrlKey,
+                usernameKey,
+                passwordKey,
+            ]);
         });
         await _8_7_1.test.step('Create Cluster Secret', async () => {
-            await clusterSecretsPage.createNewSecret(defaultClusterName, 'endpoint_url', constants_1.REST_MOCK_BASIC_AUTH_URL);
-            await clusterSecretsPage.createNewSecret(defaultClusterName, 'username', 'username');
-            await clusterSecretsPage.createNewSecret(defaultClusterName, 'password', 'password');
+            await clusterSecretsPage.createNewSecret(defaultClusterName, endpointUrlKey, constants_1.REST_MOCK_BASIC_AUTH_URL);
+            await clusterSecretsPage.createNewSecret(defaultClusterName, usernameKey, 'username');
+            await clusterSecretsPage.createNewSecret(defaultClusterName, passwordKey, 'password');
         });
         await _8_7_1.test.step('Navigate to Web Modeler', async () => {
             await (0, test_1.expect)(homePage.camundaComponentsButton).toBeVisible({
                 timeout: 20000,
             });
             await appsPage.clickCamundaApps();
-            // No separate modelerLink check: Hub has no app-switcher "Modeler" link
-            // (clickModeler() goes through its home link instead), and on the
-            // legacy shell clickModeler() asserts modelerLink itself.
+            // No separate modelerLink check: on Hub there is no app-switcher
+            // "Modeler" link, and clickModeler() handles both shells.
             await appsPage.clickModeler();
             await (0, test_1.expect)(modelerHomePage.modelerPageBanner).toBeVisible({
                 timeout: 120000,
@@ -195,7 +206,10 @@ _8_7_1.test.describe('Connectors User Flow Tests', () => {
             await modelerHomePage.clickBpmnTemplateOption();
         });
         await _8_7_1.test.step('Create BPMN Diagram with REST Connector using secrets and Start Process Instance', async () => {
-            await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, processName, 'secrets.endpoint_url', 'basic', '{message:response.body.message}', 'result', { username: 'secrets.username', password: 'secrets.password' });
+            await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, processName, `secrets.${endpointUrlKey}`, 'basic', '{message:response.body.message}', 'result', {
+                username: `secrets.${usernameKey}`,
+                password: `secrets.${passwordKey}`,
+            });
             await modelerCreatePage.runProcessInstance(defaultClusterName);
             await (0, _setup_1.performBasicAuthPostRequest)(constants_1.REST_MOCK_BASIC_AUTH_URL, 'username', 'password');
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camunda/e2e-test-suite",
-  "version": "0.0.1440",
+  "version": "0.0.1441",
   "description": "End-to-end test helpers for Camunda 8",
   "repository": {
     "type": "git",