@camunda/e2e-test-suite 0.0.1227 → 0.0.1228

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

@@ -218,6 +218,7 @@ declare class ModelerCreatePage {
     embedForm(formName: string): Promise<void>;
     clickFirstPlaceRESTConnector(): Promise<void>;
     dismissCreatePad(): Promise<void>;
+    private isAuthenticationPanelOpen;
     private openAuthenticationPanel;
     setOAuthTokenEndpoint(elementToClick: Locator, endpoint: string, options?: {
         retries?: number;

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

@@ -324,8 +324,11 @@ class ModelerCreatePage {
             .getByText('zeebeClientId');
         this.variableAssignmentValueTextboxThirdVariable = page.locator('#bio-properties-panel-StartEvent_1-output-2-source div');
         this.firstPlaceRESTConnector = page.locator('g:nth-child(2) > .djs-element > .djs-hit');
+        // Scoped to the group header (not any div whose text is "Authentication")
+        // so its class list can be read: the header carries `open` exactly while
+        // the group is expanded, which openAuthenticationPanel keys on.
         this.authenticationPanel = page
-            .locator('div')
+            .locator('.bio-properties-panel-group-header')
             .filter({ hasText: /^Authentication$/ })
             .first();
         this.templateNotFoundTag = page
@@ -1739,6 +1742,17 @@ class ModelerCreatePage {
             .waitFor({ state: 'hidden', timeout: 10000 })
             .catch(() => false);
     }
+    async isAuthenticationPanelOpen() {
+        const classes = await this.authenticationPanel
+            .getAttribute('class', { timeout: 5000 })
+            .catch(() => null);
+        return (classes ?? '').split(/\s+/).includes('open');
+    }
+    // The header is a toggle, not an "open" button, and the properties panel
+    // keeps a group's expanded state across element selections — so clicking it
+    // unconditionally collapses a group that a previous element already opened.
+    // Click only while `open` is absent, then wait for it to appear.
+    //
     // The Authentication group is contributed by the REST connector element
     // template, so it renders only while the version the diagram pins in
     // zeebe:modelerTemplateVersion is among the element templates Web Modeler
@@ -1746,22 +1760,30 @@ class ModelerCreatePage {
     // "Template: Not found" and the group can never appear, so report that as
     // its own cause instead of a bare 60s click timeout.
     async openAuthenticationPanel() {
-        try {
-            await this.authenticationPanel.click({ timeout: 60000 });
-        }
-        catch (err) {
-            const templateMissing = await this.templateNotFoundTag
-                .isVisible()
-                .catch(() => false);
-            if (templateMissing) {
-                throw new Error('REST connector element template did not resolve for this element: ' +
-                    'the properties panel shows "Template: Not found", so its ' +
-                    'Authentication group never renders. The zeebe:modelerTemplateVersion ' +
-                    'pinned in the uploaded fixture is no longer one of the element ' +
-                    'template versions this Web Modeler offers — re-pin the fixture to ' +
-                    'the offered version.');
+        for (let attempt = 1; attempt <= 3; attempt++) {
+            if (await this.isAuthenticationPanelOpen()) {
+                return;
             }
-            throw err;
+            try {
+                await this.authenticationPanel.click({ timeout: 60000 });
+            }
+            catch (err) {
+                const templateMissing = await this.templateNotFoundTag
+                    .isVisible()
+                    .catch(() => false);
+                if (templateMissing) {
+                    throw new Error('REST connector element template did not resolve for this element: ' +
+                        'the properties panel shows "Template: Not found", so its ' +
+                        'Authentication group never renders. The zeebe:modelerTemplateVersion ' +
+                        'pinned in the uploaded fixture is no longer one of the element ' +
+                        'template versions this Web Modeler offers — re-pin the fixture to ' +
+                        'the offered version.');
+                }
+                throw err;
+            }
+            await (0, test_1.expect)(this.authenticationPanel)
+                .toHaveClass(/(?:^|\s)open(?:\s|$)/, { timeout: 10000 })
+                .catch(() => false);
         }
     }
     async setOAuthTokenEndpoint(elementToClick, endpoint, options) {
@@ -1792,14 +1814,16 @@ class ModelerCreatePage {
         let lastError;
         for (let attempt = 1; attempt <= retries; attempt++) {
             try {
-                await (0, test_1.expect)(this.oauthTokenEndpointInput).toBeVisible({ timeout: 3000 });
-                await this.oauthTokenEndpointInput.click({ timeout: 3000 });
+                await (0, test_1.expect)(this.oauthTokenEndpointInput).toBeVisible({
+                    timeout: 10000,
+                });
+                await this.oauthTokenEndpointInput.click({ timeout: 10000 });
                 await this.oauthTokenEndpointInput.fill(endpoint, { timeout: 30000 });
                 return;
             }
             catch (err) {
                 lastError = err;
-                await this.authenticationPanel.click({ timeout: 60000 });
+                await this.openAuthenticationPanel();
                 await (0, sleep_1.sleep)(settleMs);
             }
         }

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

@@ -546,17 +546,30 @@ async function modelAndRunConnectorsDocHandlingDiagram(modelerCreatePage, modele
     await page.reload();
     await page.waitForLoadState('networkidle');
     await modelerCreatePage.fillStartEventVariablesForDocHandling(zeebeUrl, zeebeClientId, zeebeClientSecret);
-    await modelerCreatePage.setOAuthTokenEndpoint(page.locator('.djs-hit').first(), endpoint);
+    // bpmn-js reorders the canvas `<g>` groups as elements render and get
+    // selected, so `g:nth-child(N)` does not keep pointing at the task it was
+    // written for. Pin each shape by its BPMN id from the fixture instead: these
+    // are exactly the five REST tasks the fixture configures with
+    // `authentication.type = oauth-client-credentials-flow`, i.e. the ones that
+    // render an "OAuth 2.0 token endpoint" field. The sixth task
+    // (Activity_0jxgggi, "Download & store Image as 'doc' storage") is `noAuth`
+    // and has no such field.
+    const restTaskHit = (elementId) => page
+        .locator(`.djs-element[data-element-id="${elementId}"] .djs-hit`)
+        .first();
+    await modelerCreatePage.setOAuthTokenEndpoint(restTaskHit('Activity_0k0vloc'), endpoint);
     await (0, sleep_1.sleep)(2000);
-    await modelerCreatePage.setOAuthTokenEndpoint(page.locator('g:nth-child(3) > .djs-element > .djs-hit'), endpoint);
+    await modelerCreatePage.setOAuthTokenEndpoint(restTaskHit('Activity_02hwevk'), endpoint);
     await (0, sleep_1.sleep)(2000);
-    await modelerCreatePage.setOAuthTokenEndpoint(page.locator('g:nth-child(6) > .djs-element > .djs-hit'), endpoint);
+    await modelerCreatePage.setOAuthTokenEndpoint(restTaskHit('Activity_1oi90zl'), endpoint);
+    // The two parallel-branch tasks sit under the Details panel, so it has to be
+    // closed before their shape can be clicked and reopened afterwards.
     await (0, sleep_1.sleep)(2000);
     await modelerCreatePage.clickCloseDetailsPanel();
-    await modelerCreatePage.setOAuthTokenEndpoint(page.locator('g:nth-child(7) > .djs-element > .djs-hit'), endpoint, { openPanel: true });
+    await modelerCreatePage.setOAuthTokenEndpoint(restTaskHit('Activity_0iyt4gv'), endpoint, { openPanel: true });
     await (0, sleep_1.sleep)(2000);
     await modelerCreatePage.clickCloseDetailsPanel();
-    await modelerCreatePage.setOAuthTokenEndpoint(page.locator('g:nth-child(9) > .djs-element > .djs-hit'), endpoint, { openPanel: true });
+    await modelerCreatePage.setOAuthTokenEndpoint(restTaskHit('Activity_1oiegam'), endpoint, { openPanel: true });
     await (0, sleep_1.sleep)(2000);
     await modelerCreatePage.runProcessInstance('', tenant);
 }

package/package.json

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