@camunda/e2e-test-suite 0.0.880 → 0.0.882

package/dist/pages/8.8/ModelerCreatePage.js

@@ -121,7 +121,11 @@ class ModelerCreatePage {
             name: 'Change element',
             exact: true,
         });
-        this.userTaskOption = page.getByRole('option', { name: 'User task' });
+        // The change-element popup lists the project's deployed resources next to
+        // the built-in element types, so a role+name match on 'User task' is
+        // ambiguous whenever a diagram name contains it (e.g. "Optimize Job Worker
+        // User Task Diagram"). Target the built-in entry by its stable data-id.
+        this.userTaskOption = page.locator('.djs-popup-results [data-id="replace-with-user-task"]');
         this.priorityInput = page.getByRole('textbox', { name: 'priority' });
         this.appendEndEventButton = page.getByRole('button', {
             name: 'Append end event',
@@ -161,10 +165,11 @@ class ModelerCreatePage {
         this.deploySubButton = page.locator('[data-test="deploy-action"]');
         this.cancelButton = page.getByRole('button', { name: 'Cancel' });
         this.restConnectorOption = page.locator('[data-id="replace.template-io.camunda.connectors.HttpJson.v2"]');
-        this.webhookMessageStartEventConnectorOption = page.getByRole('listitem', {
-            name: 'Webhook Message Start Event Connector',
-            exact: true,
-        });
+        // Change-element popup entries are `role="option"` under
+        // `.djs-popup-results`, and their accessible name now includes the entry
+        // description, so no role+name matcher resolves them. Target the stable
+        // element-template data-id instead (same selector the hub e2e suite uses).
+        this.webhookMessageStartEventConnectorOption = page.locator('.djs-popup-results [data-id="replace.template-io.camunda.connectors.webhook.WebhookConnectorStartMessage.v1"]');
         this.webhookTab = page.getByRole('tab', { name: 'Webhook' });
         this.webhookIsActiveButton = page.getByRole('button', {
             name: 'Webhook is active in Test',
@@ -176,7 +181,7 @@ class ModelerCreatePage {
             .first();
         this.createTask = page.getByTitle('Create task');
         this.createEndEvent = page.getByTitle('Create end event');
-        this.canvas = page.locator('rect').nth(1);
+        this.canvas = page.locator('.djs-container');
         this.endEventCanvas = page.locator('[class="bjs-container"]');
         this.connectToOtherElementButton = page.getByRole('button', {
             name: 'Connect to other element',
@@ -198,9 +203,7 @@ class ModelerCreatePage {
         this.intermediateBoundaryEvent = page.getByRole('button', {
             name: 'Append intermediate/boundary',
         });
-        this.intermediateWebhookConnectorOption = page.getByRole('listitem', {
-            name: 'Webhook Intermediate Event',
-        });
+        this.intermediateWebhookConnectorOption = page.locator('.djs-popup-results [data-id="replace.template-io.camunda.connectors.webhook.WebhookConnectorIntermediate.v1"]');
         this.correlationKeyPayloadInput = page.getByLabel('Correlation key (payload)');
         this.correlationKeyProcessInput = page.getByLabel('Correlation key (process)');
         this.form = page.locator('[class="fjs-container"]');
@@ -243,7 +246,7 @@ class ModelerCreatePage {
         this.secondPlacedGateway = page
             .locator('[data-element-id*="Gateway"]')
             .last();
-        this.serviceTaskOption = page.getByRole('option', { name: 'Service task' });
+        this.serviceTaskOption = page.locator('.djs-popup-results [data-id="replace-with-service-task"]');
         this.taskDefinitionPanel = page.locator('[data-group-id="group-taskDefinition"]');
         this.jobTypeInput = page.getByRole('textbox', { name: /job type/i });
         this.playTab = page.getByRole('tab', {
@@ -285,10 +288,7 @@ class ModelerCreatePage {
             .getByText('zeebeClientId');
         this.variableAssignmentValueTextboxThirdVariable = page.locator('#bio-properties-panel-StartEvent_1-output-2-source div');
         this.connectorsDocHandlingStartEventElement = page.locator('g:nth-child(5) > .djs-element > .djs-hit');
-        this.timerEventOption = page.getByRole('listitem', {
-            name: 'Timer intermediate catch event',
-            exact: true,
-        });
+        this.timerEventOption = page.locator('.djs-popup-results [data-id="replace-with-timer-intermediate-catch"]');
         this.timerEventSettings = page.getByText(/^Timer$/).first();
         this.timerType = page.getByLabel('Type');
         this.timerValue = page.getByLabel('Value');
@@ -774,7 +774,11 @@ class ModelerCreatePage {
         await this.createEndEvent.click({ timeout: 60000 });
     }
     async clickCanvas() {
-        await this.canvas.click({ timeout: 60000 });
+        // Clicking the canvas centre lands on a shape (or an open create pad) as
+        // soon as the diagram has more than a couple of elements, and the click is
+        // then intercepted instead of clearing the selection. Click the empty
+        // gutter above the diagram and right of the palette instead.
+        await this.canvas.click({ timeout: 60000, position: { x: 150, y: 25 } });
     }
     async clickEndEventCanvas() {
         await this.endEventCanvas.click({ timeout: 60000 });

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

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

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

@@ -7,6 +7,7 @@ class ConnectorMarketplacePage {
     searchForConnectorTextbox;
     downloadToProjectButton;
     replaceResourceButton;
+    addToProjectButton;
     cancelButton;
     constructor(page) {
         this.page = page;
@@ -18,6 +19,9 @@ class ConnectorMarketplacePage {
         this.replaceResourceButton = page.getByRole('button', {
             name: 'Replace resource',
         });
+        this.addToProjectButton = page.getByRole('button', {
+            name: 'Add to project',
+        });
     }
     async clickSearchForConnectorTextbox() {
         await this.searchForConnectorTextbox.click({ timeout: 60000 });
@@ -36,17 +40,28 @@ class ConnectorMarketplacePage {
     async clickReplaceResourceButton() {
         await this.replaceResourceButton.click({ timeout: 30000 });
     }
+    // Hub only opens its ImportModal when the download needs confirmation, and the
+    // primary button depends on project state: "Add to project" when the template
+    // is not in the project yet, "Replace resource" when one already exists.
+    // "Cancel" aborts the import, so the primary button is chosen explicitly --
+    // racing the two clicks lets Cancel win and silently drops the template.
     async downloadConnectorToProject() {
         await this.clickDownloadToProjectButton();
-        try {
-            await Promise.race([
-                this.replaceResourceButton.click({ timeout: 20000 }),
-                this.cancelButton.click({ timeout: 20000 }),
-            ]);
-        }
-        catch (e) {
+        const primaryButton = this.addToProjectButton.or(this.replaceResourceButton);
+        const modalOpened = await primaryButton
+            .first()
+            .waitFor({ state: 'visible', timeout: 20000 })
+            .then(() => true)
+            .catch(() => false);
+        if (!modalOpened) {
             return;
         }
+        if (await this.addToProjectButton.isVisible()) {
+            await this.addToProjectButton.click({ timeout: 20000 });
+        }
+        else {
+            await this.replaceResourceButton.click({ timeout: 20000 });
+        }
     }
     // The marketplace search backend can transiently return HTTP 504
     // ("upstream request timeout"), which leaves the modal in an error or

package/dist/tests/SM-8.9/document-handling-user-flows.spec.js

@@ -116,7 +116,8 @@ if (process.env.IS_DS === 'true') {
                 await operateProcessInstancePage.assertProcessVariableContainsText('Upload_Files', 'aws');
             });
         });
-        (0, SM_8_9_1.test)('Document Handling Connectors User Flow - AWS @tasklistV2', async ({ page, navigationPage, modelerHomePage, modelerCreatePage, operateHomePage, operateProcessesPage, connectorMarketplacePage, operateProcessInstancePage, ocIdentityHomePage, ocIdentityRolesPage, }) => {
+        // Skipped due to bug #8162: https://github.com/camunda/connectors/issues/8162
+        SM_8_9_1.test.skip('Document Handling Connectors User Flow - AWS @tasklistV2', async ({ page, navigationPage, modelerHomePage, modelerCreatePage, operateHomePage, operateProcessesPage, connectorMarketplacePage, operateProcessInstancePage, ocIdentityHomePage, ocIdentityRolesPage, }) => {
             const processName = 'Document_Handling_Connectors_User_Flow_AWS_Process' +
                 (await (0, _setup_1.generateRandomStringAsync)(3));
             const baseURL = process.env.PLAYWRIGHT_BASE_URL ||

package/package.json

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