@camunda/e2e-test-suite 0.0.683 → 0.0.684

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

@@ -7,7 +7,6 @@ declare class ConnectorMarketplacePage {
     readonly closeButton: Locator;
     readonly replaceResourceButton: Locator;
     readonly addToProjectButton: Locator;
-    readonly saveAsCopyButton: Locator;
     readonly cancelButton: Locator;
     constructor(page: Page);
     clickSearchForConnectorTextbox(): Promise<void>;

package/dist/pages/8.8/ConnectorMarketplacePage.js

@@ -9,7 +9,6 @@ class ConnectorMarketplacePage {
     closeButton;
     replaceResourceButton;
     addToProjectButton;
-    saveAsCopyButton;
     cancelButton;
     constructor(page) {
         this.page = page;
@@ -22,21 +21,9 @@ class ConnectorMarketplacePage {
         this.replaceResourceButton = page.getByRole('button', {
             name: 'Replace resource',
         });
-        // Camunda Hub's ImportModal renders one of three primary buttons depending
-        // on state. Source: camunda-hub
-        // frontend/apps/hub/src/components/ImportModal/get-action-buttons-props.js
-        //   - "Add to project"   for a brand-new resource (showPublish)
-        //   - "Replace resource" when a duplicate exists and replace is allowed
-        //   - "Save as copy"     when a duplicate exists but replace is NOT
-        //                        allowed (e.g. an existing project template
-        //                        conflict — user must save the import under a
-        //                        new ID to keep both)
         this.addToProjectButton = page.getByRole('button', {
             name: 'Add to project',
         });
-        this.saveAsCopyButton = page.getByRole('button', {
-            name: 'Save as copy',
-        });
         this.cancelButton = page.getByRole('button', { name: 'Cancel' });
     }
     async clickSearchForConnectorTextbox() {
@@ -59,35 +46,31 @@ class ConnectorMarketplacePage {
     }
     async downloadConnectorToProject() {
         await this.clickDownloadToProjectButton();
-        // After "Download to project", the Hub ImportModal opens. Per
-        // camunda-hub
-        // frontend/apps/hub/src/components/ImportModal/get-action-buttons-props.js
-        // the primary button is one of:
-        //   - "Add to project"   fresh import — we want to confirm
-        //   - "Replace resource" duplicate exists, replace allowed
-        //   - "Save as copy"     duplicate exists, replace NOT allowed
-        //
-        // Strategy:
-        //   - If "Add to project" is visible, click it: the connector wasn't
-        //     in the project, this commits the fresh import.
-        //   - Otherwise the connector is already in the project (conflict).
-        //     Cancel the modal: Save as copy would create a duplicate under a
-        //     different name (and the test then can't find "Worldwide Public
-        //     Holiday"), and Replace risks other tests' state. The connector
-        //     already exists — clickPublicHolidayConnectorOption just needs
-        //     to find it in the change-element popup, which it does via a
-        //     state reset.
-        if (await this.addToProjectButton
-            .isVisible({ timeout: 20000 })
-            .catch(() => false)) {
-            await this.addToProjectButton.click({ timeout: 30000 });
-            return;
+        let imported = false;
+        try {
+            await Promise.race([
+                this.addToProjectButton.click({ timeout: 20000 }),
+                this.replaceResourceButton.click({ timeout: 20000 }),
+            ]);
+            imported = true;
+        }
+        catch (e) {
+            if (await this.cancelButton.isVisible({ timeout: 3000 }).catch(() => false)) {
+                await this.cancelButton.click({ timeout: 10000 });
+            }
         }
-        if (await this.cancelButton.isVisible({ timeout: 5000 }).catch(() => false)) {
-            await this.cancelButton.click({ timeout: 30000 });
+        // 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 });
+            }
         }
-        // If neither button is visible the import dialog never opened; nothing
-        // to dismiss and downstream state-reset will recover.
     }
 }
 exports.ConnectorMarketplacePage = ConnectorMarketplacePage;

package/dist/pages/8.8/ModelerCreatePage.js

@@ -4,6 +4,7 @@ exports.ModelerCreatePage = void 0;
 const test_1 = require("@playwright/test");
 const sleep_1 = require("../../utils/sleep");
 const clickLocatorWithRetry_1 = require("../../utils/assertionHelpers/clickLocatorWithRetry");
+const ConnectorMarketplacePage_1 = require("./ConnectorMarketplacePage");
 class ModelerCreatePage {
     page;
     generalPanel;
@@ -186,17 +187,9 @@ class ModelerCreatePage {
         this.secondPlacedElement = page.locator('g:nth-child(2) > .djs-element > .djs-hit');
         this.payloadInput = page.locator('[class="fjs-input"]');
         this.marketPlaceButton = page.getByTitle('Browse Marketplace for more Connectors');
-        // Match the listitem rendered by bpmn-js's change-element popup. The
-        // previous getByText-inside-[data-test="modeler"] resolver finds the
-        // text node anywhere in the modeler, including off-screen positions in
-        // the virtualized list — which never satisfies toBeVisible. Targeting
-        // the listitem by accessible name mirrors the SM-8.8 pattern
-        // (pages/SM-8.8/ModelerCreatePage.ts:165) and works whether the
-        // connector is at the top of the list or filtered via search.
-        this.publicHolidayConnectorOption = page.getByRole('listitem', {
-            name: 'Worldwide Public Holiday',
-            exact: false,
-        });
+        this.publicHolidayConnectorOption = page
+            .locator('[data-test="modeler"]')
+            .getByText('Worldwide Public Holiday');
         this.publicHolidayYearOption = page.getByLabel('Year');
         this.publicHolidayCountryCodeOption = page.getByLabel('Countrycode');
         this.implementationSection = page.locator('[data-group-id="group-userTaskImplementation"]');
@@ -784,77 +777,49 @@ class ModelerCreatePage {
         throw new Error(`Failed to click the button after ${maxRetries} attempts.`);
     }
     async clickPublicHolidayConnectorOption() {
-        // Port of the 8.7 state-reset approach
-        // (pages/8.7/ModelerCreatePage.ts). After the test's marketplace flow
-        // completes, the connector is on the project (whether freshly added or
-        // already there from a prior run) but the modeler may be in any of
-        // several states: change-element popup closed, residual import modal
-        // up, virtualized list with the connector off-screen. Instead of
-        // trying to manage those states, dismiss any overlay, reload the page,
-        // then re-open the change-element popup from a clean state. The
-        // downloaded connector persists across reloads (server-side project
-        // state). Filter the popup so the listitem comes into view —
-        // `.djs-popup-search input` is the popup's own search, same selector
-        // the camunda-hub e2e tests use under
-        // e2e/cypress/e2e/bpmn/browse-market-place/.
         const maxRetries = 4;
-        const setupModelerState = async () => {
-            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 the change-element popup to be fully loaded.
-            await (0, test_1.expect)(this.marketPlaceButton).toBeVisible({ timeout: 60000 });
-            // Filter the change-element popup so the connector listitem comes
-            // into the rendered slice of the virtualized list.
-            const changeElementSearch = this.page.locator('.djs-popup-search input');
-            if (await changeElementSearch.isVisible({ timeout: 5000 }).catch(() => false)) {
-                await changeElementSearch.fill('Worldwide Public Holiday');
-            }
-        };
         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
+                    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 this.clickCanvas();
+                    await this.secondElement.click({ timeout: 60000 });
+                    await this.clickChangeTypeButton();
+                }
+                // Filter the virtualized change-element popup so the option scrolls into view
+                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));
+                await this.clickCanvas();
+                await this.secondElement.click({ timeout: 60000 });
+                await this.clickChangeTypeButton();
             }
         }
-        throw new Error(`Failed to click the public holiday connector after ${maxRetries} attempts.`);
+        throw new Error(`Failed to click the button after ${maxRetries} attempts.`);
     }
     async clickPublicHolidayYearOption() {
         await this.publicHolidayYearOption.click({ timeout: 60000 });

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

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

package/dist/pages/8.9/ConnectorMarketplacePage.js

@@ -8,6 +8,7 @@ class ConnectorMarketplacePage {
     snackbar;
     closeButton;
     replaceResourceButton;
+    addToProjectButton;
     cancelButton;
     constructor(page) {
         this.page = page;
@@ -20,6 +21,9 @@ class ConnectorMarketplacePage {
         this.replaceResourceButton = page.getByRole('button', {
             name: 'Replace resource',
         });
+        this.addToProjectButton = page.getByRole('button', {
+            name: 'Add to project',
+        });
         this.cancelButton = page.getByRole('button', { name: 'Cancel' });
     }
     async clickSearchForConnectorTextbox() {
@@ -42,14 +46,30 @@ class ConnectorMarketplacePage {
     }
     async downloadConnectorToProject() {
         await this.clickDownloadToProjectButton();
+        let imported = false;
         try {
             await Promise.race([
+                this.addToProjectButton.click({ timeout: 20000 }),
                 this.replaceResourceButton.click({ timeout: 20000 }),
-                this.cancelButton.click({ timeout: 20000 }),
             ]);
+            imported = true;
         }
         catch (e) {
-            return;
+            if (await this.cancelButton.isVisible({ timeout: 3000 }).catch(() => false)) {
+                await this.cancelButton.click({ timeout: 10000 });
+            }
+        }
+        // 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.9/ModelerCreatePage.js

@@ -767,38 +767,29 @@ class ModelerCreatePage {
         const maxRetries = 4;
         for (let retries = 0; retries < maxRetries; retries++) {
             try {
-                if (retries <= 2) {
-                    // Wait explicitly for the option to render in the change-type
-                    // panel before clicking. Without this we burn an attempt every
-                    // time the panel is still loading after download.
-                    await this.publicHolidayConnectorOption.waitFor({
-                        state: 'visible',
-                        timeout: 60000,
-                    });
-                    await this.publicHolidayConnectorOption.click({ timeout: 30000 });
-                }
-                else {
+                if (retries === 2) {
+                    // Re-download connector on second retry in case the first download failed
                     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 this.publicHolidayConnectorOption.waitFor({
-                        state: 'visible',
-                        timeout: 120000,
-                    });
-                    await this.publicHolidayConnectorOption.click({ timeout: 30000 });
                 }
+                // 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 });
+                await this.publicHolidayConnectorOption.click({ timeout: 120000 });
                 return;
             }
             catch (error) {
                 console.error(`Click attempt ${retries + 1} failed: ${error}`);
+                if (retries >= maxRetries - 1)
+                    break;
                 await this.page.reload();
                 await new Promise((resolve) => setTimeout(resolve, 10000));
-                await this.clickCanvas();
-                await this.secondElement.click({ timeout: 60000 });
-                await this.clickChangeTypeButton();
             }
         }
         throw new Error(`Failed to click the button after ${maxRetries} attempts.`);

package/package.json

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