@camunda/e2e-test-suite 0.0.723 → 0.0.724

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

@@ -3,7 +3,10 @@ declare class ConnectorMarketplacePage {
     private page;
     readonly searchForConnectorTextbox: Locator;
     readonly downloadToProjectButton: Locator;
+    readonly snackbar: Locator;
     readonly replaceResourceButton: Locator;
+    readonly addToProjectButton: Locator;
+    readonly cancelButton: Locator;
     readonly closeButton: Locator;
     constructor(page: Page);
     clickSearchForConnectorTextbox(): Promise<void>;

package/dist/pages/8.7/ConnectorMarketplacePage.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectorMarketplacePage = void 0;
-const test_1 = require("@playwright/test");
 class ConnectorMarketplacePage {
     page;
     searchForConnectorTextbox;
     downloadToProjectButton;
+    snackbar;
     replaceResourceButton;
+    addToProjectButton;
+    cancelButton;
     closeButton;
     constructor(page) {
         this.page = page;
@@ -14,9 +16,14 @@ class ConnectorMarketplacePage {
         this.downloadToProjectButton = page
             .getByRole('button', { name: 'Download to project' })
             .first();
+        this.snackbar = page.locator('[data-test="snackbar"]');
         this.replaceResourceButton = page.getByRole('button', {
             name: 'Replace resource',
         });
+        this.addToProjectButton = page.getByRole('button', {
+            name: 'Add to project',
+        });
+        this.cancelButton = page.getByRole('button', { name: 'Cancel' });
         this.closeButton = page.getByRole('button', { name: 'Close' });
     }
     async clickSearchForConnectorTextbox() {
@@ -36,12 +43,38 @@ class ConnectorMarketplacePage {
     }
     async downloadConnectorToProject() {
         await this.clickDownloadToProjectButton();
-        try {
-            await (0, test_1.expect)(this.replaceResourceButton).toBeVisible();
-            await this.clickReplaceResourceButton();
+        let imported = false;
+        // A fresh download shows "Add to project"; an already-present resource
+        // shows "Replace resource". Pick whichever the ImportModal rendered —
+        // 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.
+        if (await this.addToProjectButton
+            .isVisible({ timeout: 20000 })
+            .catch(() => false)) {
+            await this.addToProjectButton.click({ timeout: 10000 });
+            imported = true;
+        }
+        else if (await this.replaceResourceButton
+            .isVisible({ timeout: 5000 })
+            .catch(() => false)) {
+            await this.replaceResourceButton.click({ timeout: 10000 });
+            imported = true;
+        }
+        else if (await this.cancelButton.isVisible({ timeout: 3000 }).catch(() => false)) {
+            await this.cancelButton.click({ timeout: 10000 });
         }
-        catch (e) {
-            return;
+        // After a successful import, wait for the snackbar (confirms the connector
+        // template was received by the modeler) then close the marketplace panel so
+        // the diagram canvas is unblocked before the caller tries to select the
+        // newly installed connector.
+        if (imported) {
+            await this.snackbar
+                .waitFor({ state: 'visible', timeout: 60000 })
+                .catch(() => { });
+            if (await this.closeButton.isVisible({ timeout: 5000 }).catch(() => false)) {
+                await this.closeButton.click({ timeout: 10000 });
+            }
         }
     }
 }

package/dist/pages/8.7/ModelerCreatePage.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelerCreatePage = void 0;
 const test_1 = require("@playwright/test");
 const sleep_1 = require("../../utils/sleep");
+const ConnectorMarketplacePage_1 = require("./ConnectorMarketplacePage");
 class ModelerCreatePage {
     page;
     generalPanel;
@@ -707,55 +708,44 @@ class ModelerCreatePage {
     }
     async clickPublicHolidayConnectorOption() {
         const maxRetries = 4;
-        const setupModelerState = async () => {
-            // Navigate back from marketplace (full-page nav in 8.7) if needed
-            const onModeler = await this.page
-                .locator('[data-test="modeler"]')
-                .waitFor({ state: 'visible', timeout: 5000 })
-                .then(() => true)
-                .catch(() => false);
-            if (!onModeler) {
-                await this.page.keyboard.press('Escape');
-                await this.page.waitForTimeout(2000);
-                const afterEscape = await this.page
-                    .locator('[data-test="modeler"]')
-                    .waitFor({ state: 'visible', timeout: 3000 })
-                    .then(() => true)
-                    .catch(() => false);
-                if (!afterEscape) {
-                    await this.page.goBack();
-                    await this.page.waitForTimeout(5000);
-                }
-                await this.page.reload();
-                await this.page.waitForTimeout(5000);
-            }
-            await this.clickCanvas();
-            await this.secondElement.click({ timeout: 60000 });
-            await this.clickChangeTypeButton();
-            // Wait for change-type panel to be fully loaded before clicking connector
-            await (0, test_1.expect)(this.marketPlaceButton).toBeVisible({ timeout: 60000 });
-        };
         for (let retries = 0; retries < maxRetries; retries++) {
             try {
-                await setupModelerState();
-                await this.publicHolidayConnectorOption.click({ timeout: 120000 });
+                if (retries === 2) {
+                    // Re-download connector on second retry in case the first download
+                    // failed to confirm the import.
+                    await this.clickMarketPlaceButton();
+                    const connectorMarketplacePage = new ConnectorMarketplacePage_1.ConnectorMarketplacePage(this.page);
+                    await connectorMarketplacePage.clickSearchForConnectorTextbox();
+                    await connectorMarketplacePage.fillSearchForConnectorTextbox('Worldwide Public Holiday');
+                    await (0, sleep_1.sleep)(10000);
+                    await connectorMarketplacePage.downloadConnectorToProject();
+                }
+                // 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 — `getByText` alone never matches an off-screen entry.
+                const changeElementSearch = this.page.locator('.djs-popup-search input');
+                if (await changeElementSearch
+                    .isVisible({ timeout: 5000 })
+                    .catch(() => false)) {
+                    await changeElementSearch.pressSequentially('Worldwide Public Holiday', { delay: 50 });
+                }
+                await this.publicHolidayConnectorOption.waitFor({
+                    state: 'visible',
+                    timeout: 60000,
+                });
+                await this.publicHolidayConnectorOption.click({ timeout: 30000 });
                 return;
             }
             catch (error) {
                 console.error(`Click attempt ${retries + 1} failed: ${error}`);
                 if (retries >= maxRetries - 1)
                     break;
-                const onModeler = await this.page
-                    .locator('[data-test="modeler"]')
-                    .waitFor({ state: 'visible', timeout: 3000 })
-                    .then(() => true)
-                    .catch(() => false);
-                if (!onModeler) {
-                    await this.page.goBack();
-                    await this.page.waitForTimeout(3000);
-                }
                 await this.page.reload();
-                await this.page.waitForTimeout(5000);
+                await new Promise((resolve) => setTimeout(resolve, 10000));
             }
         }
         throw new Error(`Failed to click the public holiday connector after ${maxRetries} attempts.`);

package/package.json

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