@camunda/e2e-test-suite 0.0.1148 → 0.0.1150

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

@@ -9,6 +9,7 @@ declare class ConnectorMarketplacePage {
     readonly replaceResourceButton: Locator;
     readonly saveAsCopyButton: Locator;
     readonly cancelButton: Locator;
+    readonly dialogTitle: Locator;
     constructor(page: Page);
     clickSearchForConnectorTextbox(): Promise<void>;
     fillSearchForConnectorTextbox(connectorName: string): Promise<void>;
@@ -16,6 +17,8 @@ declare class ConnectorMarketplacePage {
     clickSnackbar(): Promise<void>;
     clickCloseButton(): Promise<void>;
     clickReplaceResourceButton(): Promise<void>;
-    downloadConnectorToProject(): Promise<void>;
+    downloadConnectorToProject(): Promise<boolean>;
+    private closeMarketplaceDialog;
+    searchAndDownloadConnector(connectorName: string): Promise<boolean>;
 }
 export { ConnectorMarketplacePage };

package/dist/pages/8.10/ConnectorMarketplacePage.js

@@ -11,8 +11,13 @@ class ConnectorMarketplacePage {
     replaceResourceButton;
     saveAsCopyButton;
     cancelButton;
+    dialogTitle;
     constructor(page) {
         this.page = page;
+        // Title of the marketplace dialog itself — present both while the listing
+        // renders and while it is stuck on its loading spinner, so it is the one
+        // reliable marker of "the dialog is still up".
+        this.dialogTitle = page.getByText('Browse Marketplace connectors');
         this.searchForConnectorTextbox = page.getByPlaceholder('Search for a connector');
         this.downloadToProjectButton = page
             .getByRole('button', { name: 'Download to project' })
@@ -48,38 +53,65 @@ class ConnectorMarketplacePage {
     }
     async downloadConnectorToProject() {
         await this.clickDownloadToProjectButton();
-        // After clicking "Download to project", Hub opens an ImportModal whose
-        // primary button depends on project state: "Add to project" (new template),
-        // "Replace resource" (same template exists), or "Save as copy" (conflict).
-        // Race all three click calls — Playwright's click() waits for actionability,
-        // so whichever button Hub actually renders will win the race and be clicked.
-        // If none appear within 20 s (e.g. the modal never opened), the race rejects
-        // and the catch path handles any residual Cancel button.
-        let imported = false;
-        try {
-            await Promise.race([
-                this.addToProjectButton.click({ timeout: 20000 }),
-                this.replaceResourceButton.click({ timeout: 20000 }),
-                this.saveAsCopyButton.click({ timeout: 20000 }),
-            ]);
-            imported = true;
-        }
-        catch (e) {
-            if (await this.cancelButton.isVisible({ timeout: 3000 }).catch(() => false)) {
-                await this.cancelButton.click({ timeout: 10000 });
-            }
-        }
-        // Wait for the snackbar that confirms the template was received, then close
-        // the marketplace dialog so the change-element popup is unblocked before the
-        // caller selects the newly installed connector.
+        // After clicking "Download to project", Hub fetches the connector detail
+        // and opens an ImportModal whose primary button depends on project state:
+        // "Add to project" (new template), "Replace resource" (same template
+        // exists), or "Save as copy" (conflict). Wait once for whichever of the
+        // three Hub renders, then click that one — never race three clicks, which
+        // fires all of them at the same time and hides which button was missing.
+        const importButton = this.addToProjectButton
+            .or(this.replaceResourceButton)
+            .or(this.saveAsCopyButton);
+        const imported = await importButton
+            .waitFor({ state: 'visible', timeout: 20000 })
+            .then(() => true)
+            .catch(() => false);
         if (imported) {
+            await importButton.click({ timeout: 20000 });
+            // The snackbar confirms Hub received the template. It auto-dismisses, so
+            // a miss is not treated as fatal here — the caller proves the template
+            // landed by finding the connector in the change-element popup.
             await this.snackbar
                 .waitFor({ state: 'visible', timeout: 60000 })
-                .catch(() => { });
-            if (await this.closeButton.isVisible({ timeout: 5000 }).catch(() => false)) {
-                await this.closeButton.click({ timeout: 10000 });
-            }
+                .catch(() => false);
         }
+        else if (await this.cancelButton.isVisible({ timeout: 3000 }).catch(() => false)) {
+            await this.cancelButton.click({ timeout: 10000 });
+        }
+        // Always close the marketplace dialog, download or not. When Hub's
+        // connector-detail request fails (observed as a 504 on
+        // /api/external/marketplace/connectors/<id>) the dialog stays up on its
+        // loading spinner forever and swallows every click on the canvas beneath
+        // it, so leaving it open turns one failed download into a cascade of
+        // 60 s timeouts in the caller.
+        await this.closeMarketplaceDialog();
+        return imported;
+    }
+    async closeMarketplaceDialog() {
+        if (await this.closeButton.isVisible({ timeout: 5000 }).catch(() => false)) {
+            await this.closeButton.click({ timeout: 10000 });
+        }
+        if (await this.dialogTitle
+            .waitFor({ state: 'hidden', timeout: 10000 })
+            .then(() => true)
+            .catch(() => false)) {
+            return;
+        }
+        // The stuck-spinner state can leave the close control unresponsive;
+        // Escape dismisses the dialog just as reliably.
+        await this.page.keyboard.press('Escape');
+        await this.dialogTitle.waitFor({ state: 'hidden', timeout: 30000 });
+    }
+    async searchAndDownloadConnector(connectorName) {
+        await this.clickSearchForConnectorTextbox();
+        await this.fillSearchForConnectorTextbox(connectorName);
+        // Wait for the searched connector's card to render before downloading, so
+        // the click cannot land on a leftover card from the unfiltered listing.
+        await this.page
+            .getByText(connectorName, { exact: true })
+            .first()
+            .waitFor({ state: 'visible', timeout: 60000 });
+        return await this.downloadConnectorToProject();
     }
 }
 exports.ConnectorMarketplacePage = ConnectorMarketplacePage;

package/dist/pages/8.10/ModelerCreatePage.d.ts

@@ -185,6 +185,7 @@ declare class ModelerCreatePage {
     private openAppendCreatePad;
     clickAppendElementButton(): Promise<void>;
     clickMarketPlaceButton(): Promise<void>;
+    private openChangeElementPopup;
     clickPublicHolidayConnectorOption(): Promise<void>;
     clickPublicHolidayYearOption(): Promise<void>;
     fillPublicHolidayYearOption(year: string): Promise<void>;

package/dist/pages/8.10/ModelerCreatePage.js

@@ -1106,24 +1106,34 @@ class ModelerCreatePage {
         }
         throw new Error(`Failed to click the button after ${maxRetries} attempts.`);
     }
+    async openChangeElementPopup() {
+        await this.clickCanvas();
+        await this.secondElement.click({ timeout: 60000 });
+        await this.clickChangeTypeButton();
+        await (0, test_1.expect)(this.marketPlaceButton).toBeVisible({ timeout: 60000 });
+    }
     async clickPublicHolidayConnectorOption() {
         const maxRetries = 4;
         for (let retries = 0; retries < maxRetries; retries++) {
             try {
-                if (retries === 2) {
-                    // Re-download connector on second retry in case the first download failed
+                // Always open the change-type popup before trying to click the option.
+                // This has to come first: the marketplace button only exists inside
+                // that popup, so the re-download recovery below can only work once the
+                // popup is open (it used to run before this block, right after a
+                // page.reload(), and so could never find the button).
+                await this.openChangeElementPopup();
+                if (retries > 0) {
+                    // The previous attempt did not find the connector in the popup, so
+                    // the marketplace download never landed — Hub's connector-detail
+                    // request can fail (a 504 on
+                    // /api/external/marketplace/connectors/<id> leaves the marketplace
+                    // dialog stuck on its spinner and no import modal opens). Re-run the
+                    // download from the now-open popup, then reopen the popup.
                     await this.clickMarketPlaceButton();
                     const connectorMarketplacePage = new ConnectorMarketplacePage_1.ConnectorMarketplacePage(this.page);
-                    await connectorMarketplacePage.clickSearchForConnectorTextbox();
-                    await connectorMarketplacePage.fillSearchForConnectorTextbox('Public Holiday Connector');
-                    await (0, sleep_1.sleep)(10000);
-                    await connectorMarketplacePage.downloadConnectorToProject();
+                    await connectorMarketplacePage.searchAndDownloadConnector('Public Holiday Connector');
+                    await this.openChangeElementPopup();
                 }
-                // Always open the change-type popup before trying to click the option
-                await this.clickCanvas();
-                await this.secondElement.click({ timeout: 60000 });
-                await this.clickChangeTypeButton();
-                await (0, test_1.expect)(this.marketPlaceButton).toBeVisible({ timeout: 60000 });
                 // Filter the virtualized change-element popup so the option scrolls
                 // into view. Search by each full connector name (the marketplace
                 // renamed it "Public Holiday Outbound" -> "Worldwide Public Holiday"),

package/package.json

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