@camunda/e2e-test-suite 0.0.960 → 0.0.962

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

@@ -13,6 +13,7 @@ declare class ConnectorMarketplacePage {
     clickCancelButton(): Promise<void>;
     clickReplaceResourceButton(): Promise<void>;
     downloadConnectorToProject(): Promise<void>;
+    private waitForImportToSettle;
     searchAndDownloadConnector(connectorName: string, maxRetries?: number): Promise<void>;
 }
 export { ConnectorMarketplacePage };

package/dist/pages/SM-8.9/ConnectorMarketplacePage.js

@@ -54,6 +54,7 @@ class ConnectorMarketplacePage {
             .then(() => true)
             .catch(() => false);
         if (!modalOpened) {
+            await this.waitForImportToSettle();
             return;
         }
         if (await this.addToProjectButton.isVisible()) {
@@ -62,6 +63,20 @@ class ConnectorMarketplacePage {
         else {
             await this.replaceResourceButton.click({ timeout: 20000 });
         }
+        await this.waitForImportToSettle(primaryButton.first());
+    }
+    // Hub writes the template into the project asynchronously after the primary
+    // button is clicked, and keeps the ImportModal mounted until that request
+    // resolves. Returning as soon as the click resolved let the caller's
+    // `page.reload()` tear the page down ~90ms later and abort the write, leaving
+    // the project's connector-template list empty.
+    async waitForImportToSettle(modalButton) {
+        if (modalButton) {
+            await modalButton
+                .waitFor({ state: 'hidden', timeout: 60000 })
+                .catch(() => { });
+        }
+        await this.page.waitForLoadState('networkidle').catch(() => { });
     }
     // The marketplace search backend can transiently return HTTP 504
     // ("upstream request timeout"), which leaves the modal in an error or

package/dist/pages/SM-8.9/ModelerCreatePage.d.ts

@@ -191,6 +191,7 @@ declare class ModelerCreatePage {
     fillZeebeRestValue(zeebeUrl: string): Promise<void>;
     embedForm(formName: string): Promise<void>;
     clickFirstPlaceRESTConnector(): Promise<void>;
+    isConnectorTemplateApplied(timeout?: number): Promise<boolean>;
     setOAuthTokenEndpoint(elementToClick: Locator, endpoint: string, options?: {
         retries?: number;
         settleMs?: number;

package/dist/pages/SM-8.9/ModelerCreatePage.js

@@ -1064,6 +1064,17 @@ class ModelerCreatePage {
     async clickFirstPlaceRESTConnector() {
         await this.firstPlaceRESTConnector.click({ timeout: 60000 });
     }
+    // The Authentication group is contributed by the REST connector element
+    // template, so it exists only while that template resolves for the selected
+    // element. When the marketplace import never reached the project the panel
+    // renders `Template: Not found` instead and no amount of waiting produces
+    // the group.
+    async isConnectorTemplateApplied(timeout = 30000) {
+        return this.authenticationPanel
+            .waitFor({ state: 'visible', timeout })
+            .then(() => true)
+            .catch(() => false);
+    }
     async setOAuthTokenEndpoint(elementToClick, endpoint, options) {
         const retries = options?.retries ?? 2;
         const settleMs = options?.settleMs ?? 250;

package/dist/pages/SM-8.9/ModelerHomePage.js

@@ -206,11 +206,18 @@ class ModelerHomePage {
         // restarts. Wait for the app shell before checking for the dropdown, and
         // reload-then-wait on each retry so a 503 is ridden out rather than
         // reasserted against the error page.
+        // `expectLocatorWithRetry` re-checks its elapsed budget before every
+        // attempt, so the 60s default `totalTimeout` was spent inside a single
+        // `waitForModelerReady` recovery and the helper gave up "after 1 attempts"
+        // -- the reload-and-wait retry never actually ran. Bound the recovery wait
+        // and widen the budget so all three attempts fit.
         await this.waitForModelerReady();
         await (0, expectLocatorWithRetry_1.expectLocatorWithRetry)(this.page, this.diagramTypeDropdown, {
+            visibilityTimeout: 15000,
+            totalTimeout: 180000,
             postAction: async () => {
                 await this.page.reload();
-                await this.waitForModelerReady();
+                await this.waitForModelerReady(45000);
             },
         });
         await this.diagramTypeDropdown.click();

package/dist/pages/SM-8.9/UtilitiesPage.js

@@ -428,6 +428,32 @@ async function expectTextWithPagination(page, text, shouldExist = true, timeout
     }
 }
 exports.expectTextWithPagination = expectTextWithPagination;
+// SM Web Modeler ships no bundled marketplace connectors, so the REST connector
+// template has to be imported from the marketplace into the project before any
+// of the OAuth steps below can find the template-provided Authentication group.
+// The import is confirmed against the diagram itself and re-driven when it did
+// not land, so a dropped import fails here with its own cause instead of five
+// 60s waits on a panel that can never render.
+async function importRestConnectorTemplate(modelerCreatePage, connectorMarketplacePage, page) {
+    const maxAttempts = 2;
+    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+        await modelerCreatePage.clickFirstPlaceRESTConnector();
+        await modelerCreatePage.clickChangeTypeButton();
+        await modelerCreatePage.clickMarketPlaceButton();
+        await connectorMarketplacePage.searchAndDownloadConnector('REST Connector');
+        await page.reload();
+        await page.waitForLoadState('networkidle');
+        await modelerCreatePage.clickFirstPlaceRESTConnector();
+        if (await modelerCreatePage.isConnectorTemplateApplied()) {
+            return;
+        }
+        console.warn(`REST connector template did not resolve on the diagram after import ` +
+            `attempt ${attempt}/${maxAttempts}; re-importing from the marketplace.`);
+    }
+    throw new Error(`REST connector template was not imported into the project after ` +
+        `${maxAttempts} marketplace attempts: the element still renders ` +
+        `"Template: Not found", so its Authentication group never exists.`);
+}
 async function modelAndRunConnectorsDocHandlingDiagram(modelerCreatePage, modelerHomePage, processName, page, connectorMarketplacePage, zeebeUrl, zeebeClientId, zeebeClientSecret, endpoint, tenant = '') {
     await modelerHomePage.clickCrossComponentProjectFolder();
     await modelerHomePage.clickDiagramTypeDropdown();
@@ -443,12 +469,7 @@ async function modelAndRunConnectorsDocHandlingDiagram(modelerCreatePage, modele
     await modelerCreatePage.clickIdInput();
     await modelerCreatePage.fillIdInput(processName);
     await (0, sleep_1.sleep)(10000);
-    await modelerCreatePage.clickFirstPlaceRESTConnector();
-    await modelerCreatePage.clickChangeTypeButton();
-    await modelerCreatePage.clickMarketPlaceButton();
-    await connectorMarketplacePage.searchAndDownloadConnector('REST Connector');
-    await page.reload();
-    await page.waitForLoadState('networkidle');
+    await importRestConnectorTemplate(modelerCreatePage, connectorMarketplacePage, page);
     await modelerCreatePage.fillStartEventVariablesForDocHandling(zeebeUrl, zeebeClientId, zeebeClientSecret);
     await modelerCreatePage.setOAuthTokenEndpoint(page.locator('.djs-hit').first(), endpoint);
     await (0, sleep_1.sleep)(2000);

package/dist/tests/8.9/hto-user-flows.spec.js

@@ -248,17 +248,17 @@ _8_9_1.test.describe('HTO User Flow Tests', () => {
             await (0, test_1.expect)(operateHomePage.editVariableSpinner).not.toBeVisible({
                 timeout: 180000,
             });
+            // Operate can render a stale /v2/variables/search response when two
+            // polls overlap right after the update, and then stops polling
+            // variables, so the panel stays pinned to the old value and a passive
+            // wait can never recover. Re-assert across page reloads instead.
+            await (0, UtilitiesPage_1.assertPageTextWithRetry)(page, '"updatedValue"');
             await (0, test_1.expect)(page.getByText('"testValue"')).not.toBeVisible({
                 timeout: 60000,
             });
-            await (0, test_1.expect)(page.getByText('"updatedValue"')).toBeVisible({
-                timeout: 90000,
-            });
             await appsPage.clickCamundaApps();
             await appsPage.clickTasklist(clusterName);
-            await (0, test_1.expect)(taskPanelPage.taskListPageBanner).toBeVisible({
-                timeout: 20000,
-            });
+            await (0, UtilitiesPage_1.assertLocatorVisibleWithRetry)(page, taskPanelPage.taskListPageBanner, 'Tasklist banner');
             await (0, expectTextWithRetry_1.expectTextWithRetry)(page, processName);
             await taskPanelPage.openTask(processName);
             await (0, test_1.expect)(page.getByText('testVariable')).toBeVisible({

package/package.json

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