@camunda/e2e-test-suite 0.0.878 → 0.0.880

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

@@ -103,18 +103,19 @@ class ModelerCreatePage {
         this.elemendIdInput = page.getByLabel('ID', { exact: true });
         this.startEventElement = page.locator('.djs-hit').first();
         this.appendPreButton = page.locator('.djs-create-pad-icon > svg').first();
-        this.appendTaskButton = page.getByTitle('Append task');
+        this.appendTaskButton = page.getByRole('button', { name: 'Append task' });
         this.changeTypeButton = page.getByRole('button', {
             name: 'Change element',
             exact: true,
         });
-        this.userTaskOption = page
-            .getByRole('listitem', { name: 'User task' })
-            .locator('span')
-            .first();
-        this.serviceTaskOption = page.getByRole('listitem', { name: 'Service Task' });
-        this.appendEndEventButton = page.getByTitle('Append end event');
-        this.appendGatewayButton = page.getByTitle('append gateway');
+        this.userTaskOption = page.getByRole('option', { name: 'User task' });
+        this.serviceTaskOption = page.getByRole('option', { name: 'Service task' });
+        this.appendEndEventButton = page.getByRole('button', {
+            name: 'Append end event',
+        });
+        this.appendGatewayButton = page.getByRole('button', {
+            name: 'Append gateway',
+        });
         this.parallelGatewayOption = page.getByText('parallel gateway');
         this.dialog = page.getByRole('dialog');
         this.startInstanceMainButton = page.getByRole('button', {
@@ -147,9 +148,7 @@ class ModelerCreatePage {
             .getByRole('dialog')
             .getByRole('button', { name: 'Deploy' });
         this.cancelButton = page.getByRole('button', { name: 'Cancel' });
-        this.restConnectorOption = page.getByRole('listitem', {
-            name: 'REST Outbound Connector',
-        });
+        this.restConnectorOption = page.locator('[data-id="replace.template-io.camunda.connectors.HttpJson.v2"]');
         this.changeElementSearchInput = page.locator('.djs-popup-search input');
         this.marketPlaceButton = page.getByTitle('Browse Marketplace for more Connectors');
         this.clientIdTextbox = page.getByLabel('Client ID');
@@ -179,9 +178,13 @@ class ModelerCreatePage {
         this.secondPlacedElement = page
             .locator('[class= "djs-element djs-shape"]')
             .last();
-        this.connectToOtherElementButton = page.getByTitle('Connect to other element');
+        this.connectToOtherElementButton = page.getByRole('button', {
+            name: 'Connect to other element',
+        });
         this.canvas = page.locator('rect').nth(1);
-        this.intermediateBoundaryEvent = page.getByTitle('Append intermediate/boundary');
+        this.intermediateBoundaryEvent = page.getByRole('button', {
+            name: 'Append intermediate/boundary',
+        });
         this.intermediateWebhookConnectorOption = page.getByRole('listitem', {
             name: 'Webhook Intermediate Event Connector',
         });

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

@@ -4,7 +4,10 @@ declare class ConnectorMarketplacePage {
     readonly searchForConnectorTextbox: Locator;
     readonly downloadToProjectButton: Locator;
     readonly replaceResourceButton: Locator;
+    readonly addToProjectButton: Locator;
     readonly cancelButton: Locator;
+    readonly backToMarketplaceButton: Locator;
+    readonly downloadErrorMessage: Locator;
     constructor(page: Page);
     clickSearchForConnectorTextbox(): Promise<void>;
     fillSearchForConnectorTextbox(connectorName: string): Promise<void>;
@@ -12,5 +15,6 @@ declare class ConnectorMarketplacePage {
     clickCancelButton(): Promise<void>;
     clickReplaceResourceButton(): Promise<void>;
     downloadConnectorToProject(): Promise<void>;
+    searchAndDownloadConnector(connectorName: string, maxRetries?: number): Promise<void>;
 }
 export { ConnectorMarketplacePage };

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

@@ -7,7 +7,10 @@ class ConnectorMarketplacePage {
     searchForConnectorTextbox;
     downloadToProjectButton;
     replaceResourceButton;
+    addToProjectButton;
     cancelButton;
+    backToMarketplaceButton;
+    downloadErrorMessage;
     constructor(page) {
         this.page = page;
         this.searchForConnectorTextbox = page.getByPlaceholder('Search for a connector');
@@ -18,6 +21,15 @@ class ConnectorMarketplacePage {
         this.replaceResourceButton = page.getByRole('button', {
             name: 'Replace resource',
         });
+        this.addToProjectButton = page.getByRole('button', {
+            name: 'Add to project',
+        });
+        this.backToMarketplaceButton = page.getByRole('button', {
+            name: 'Back to Marketplace',
+        });
+        this.downloadErrorMessage = page
+            .getByText('Download Error')
+            .or(page.getByText('We are sorry, an error occurred'));
     }
     async clickSearchForConnectorTextbox() {
         await this.searchForConnectorTextbox.click({ timeout: 60000 });
@@ -35,17 +47,55 @@ class ConnectorMarketplacePage {
     async clickReplaceResourceButton() {
         await this.replaceResourceButton.click({ timeout: 30000 });
     }
+    // The import dialog confirms with either "Add to project" (the resource is new
+    // to the project) or "Replace resource" (a file with the same name already
+    // exists); on a backend failure it renders a download-error panel with neither
+    // button. Probe which one rendered and click only that one - issuing both
+    // clicks through Promise.race also fired the Cancel click, so the import was
+    // abandoned and the connector template never landed in the project.
     async downloadConnectorToProject() {
         await this.clickDownloadToProjectButton();
-        try {
-            await Promise.race([
-                this.replaceResourceButton.click({ timeout: 20000 }),
-                this.cancelButton.click({ timeout: 20000 }),
-            ]);
+        const importConfirmButton = this.addToProjectButton.or(this.replaceResourceButton);
+        const settled = await importConfirmButton
+            .or(this.downloadErrorMessage)
+            .first()
+            .waitFor({ state: 'visible', timeout: 20000 })
+            .then(() => true)
+            .catch(() => false);
+        if (settled && (await importConfirmButton.first().isVisible())) {
+            await importConfirmButton.first().click({ timeout: 30000 });
         }
-        catch (e) {
-            return;
+    }
+    // The marketplace backend transiently fails in two ways: the search returns an
+    // error instead of results, or the resource download from the external
+    // marketplace host ends in a download-error panel. Either way no template
+    // lands in the project, so re-issue the search and download (clearing the
+    // field first) with escalating backoff until one attempt completes cleanly.
+    async searchAndDownloadConnector(connectorName, maxRetries = 6) {
+        for (let attempt = 1; attempt <= maxRetries; attempt++) {
+            if (await this.backToMarketplaceButton.isVisible()) {
+                await this.backToMarketplaceButton.click({ timeout: 30000 });
+            }
+            await this.clickSearchForConnectorTextbox();
+            await this.searchForConnectorTextbox.fill('', { timeout: 60000 });
+            await this.fillSearchForConnectorTextbox(connectorName);
+            const isDownloadable = await this.downloadToProjectButton
+                .waitFor({ state: 'visible', timeout: 30000 })
+                .then(() => true)
+                .catch(() => false);
+            if (isDownloadable) {
+                await this.downloadConnectorToProject();
+                if (!(await this.downloadErrorMessage.first().isVisible())) {
+                    return;
+                }
+            }
+            if (attempt < maxRetries) {
+                await (0, sleep_1.sleep)(attempt * 5000);
+            }
         }
+        throw new Error(`Connector "${connectorName}" could not be downloaded from the ` +
+            `marketplace after ${maxRetries} attempts; the marketplace search or ` +
+            `download API is returning errors.`);
     }
 }
 exports.ConnectorMarketplacePage = ConnectorMarketplacePage;

package/dist/pages/SM-8.8/ModelerHomePage.d.ts

@@ -31,6 +31,7 @@ declare class ModelerHomePage {
     constructor(page: Page);
     clickCreateNewProjectButton(): Promise<void>;
     enterNewProjectName(name: string): Promise<void>;
+    waitForModelerReady(timeoutMs?: number): Promise<void>;
     createCrossComponentProjectFolder(): Promise<void>;
     clickCrossComponentProjectFolder(): Promise<void>;
     clickProcessDiagram(name: string): Promise<void>;

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

@@ -5,6 +5,7 @@ const test_1 = require("@playwright/test");
 const sleep_1 = require("../../utils/sleep");
 const expectLocatorWithRetry_1 = require("../../utils/assertionHelpers/expectLocatorWithRetry");
 const LoginPage_1 = require("./LoginPage");
+const NavigationPage_1 = require("./NavigationPage");
 class ModelerHomePage {
     page;
     defaultFolderName = 'Cross Component Test Project';
@@ -106,15 +107,53 @@ class ModelerHomePage {
         await this.projectNameInput.fill(name);
         await this.projectNameInput.press('Enter');
     }
+    // goToModeler() gates on the nav banner, but that banner also renders on the
+    // unauthenticated `/modeler/login` page — so navigation can settle on a shell
+    // whose project list never loads. Gate on an actionable element (the "New
+    // project" button or an existing project folder) instead.
+    async waitForModelerReady(timeoutMs = 120000) {
+        // .first(): when the project folder already exists on the shared cluster
+        // both elements match, and waitFor() requires a single element.
+        await this.createNewProjectButton
+            .or(this.crossComponentProjectFolder)
+            .first()
+            .waitFor({ state: 'visible', timeout: timeoutMs });
+    }
     async createCrossComponentProjectFolder() {
-        await this.clickMessageBanner();
-        if (await this.crossComponentProjectFolder.isVisible()) {
-            console.log('Cross Component Project folder already exists. Clicking into it');
-            await this.clickCrossComponentProjectFolder();
-            return;
+        const maxAttempts = 3;
+        for (let attempt = 0; attempt < maxAttempts; attempt++) {
+            try {
+                await this.waitForModelerReady();
+                await this.clickMessageBanner();
+                if (await this.crossComponentProjectFolder.isVisible()) {
+                    console.log('Cross Component Project folder already exists. Clicking into it');
+                    await this.clickCrossComponentProjectFolder();
+                    return;
+                }
+                await this.clickCreateNewProjectButton();
+                await this.enterNewProjectName(this.defaultFolderName);
+                return;
+            }
+            catch (error) {
+                if (attempt < maxAttempts - 1) {
+                    console.log(`createCrossComponentProjectFolder attempt ${attempt + 1} failed. Re-authenticating and retrying...`);
+                    // The Modeler SPA requests the OIDC discovery document once per load;
+                    // when Identity answers 503 it stops at a spinner and never retries,
+                    // so waiting longer on the same page cannot help. A bare reload can
+                    // land back on the empty login form without re-authenticating, so
+                    // re-run the full navigation+login flow.
+                    try {
+                        await new NavigationPage_1.NavigationPage(this.page).goToModeler();
+                    }
+                    catch (navError) {
+                        console.log(`Re-navigation to Modeler failed: ${navError}`);
+                    }
+                }
+                else {
+                    throw error;
+                }
+            }
         }
-        await this.clickCreateNewProjectButton();
-        await this.enterNewProjectName(this.defaultFolderName);
     }
     async clickCrossComponentProjectFolder() {
         let attempts = 0;

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

@@ -443,42 +443,13 @@ async function modelAndRunConnectorsDocHandlingDiagram(modelerCreatePage, modele
     await (0, sleep_1.sleep)(10000);
     await modelerCreatePage.clickFirstPlaceRESTConnector();
     await modelerCreatePage.clickChangeTypeButton();
-    try {
-        // REST Outbound Connector is bundled in the modeler; apply it directly
-        // from the change-type panel. The marketplace search for the bundled
-        // connector no longer returns a match, so only fall back to it when the
-        // bundled option is genuinely absent. Mirrors modelRestConnector above.
-        //
-        // The change-element popup virtualizes its list: connector templates
-        // render below the built-in BPMN tasks and are not in the queryable DOM
-        // slice until the list is filtered. Type into the popup search box (the
-        // same `.djs-popup-search input` selector the bpmn-js/hub e2e tests use)
-        // so the REST Outbound Connector entry is rendered before asserting on it.
-        // Wait for the search input to render before filling: a bare isVisible()
-        // check races the popup re-render and silently skips the fill, leaving the
-        // list unfiltered so the off-screen connector entry never appears.
-        await (0, test_1.expect)(modelerCreatePage.changeElementSearchInput).toBeVisible({
-            timeout: 30000,
-        });
-        await modelerCreatePage.changeElementSearchInput.fill('REST Outbound');
-        await (0, test_1.expect)(modelerCreatePage.restConnectorOption).toBeVisible({
-            timeout: 15000,
-        });
-        await modelerCreatePage.restConnectorOption.scrollIntoViewIfNeeded();
-        await modelerCreatePage.restConnectorOption.click({
-            timeout: 60000,
-            force: true,
-        });
-    }
-    catch {
-        await modelerCreatePage.clickMarketPlaceButton();
-        await connectorMarketplacePage.clickSearchForConnectorTextbox();
-        await connectorMarketplacePage.fillSearchForConnectorTextbox('REST Connector');
-        await connectorMarketplacePage.downloadConnectorToProject();
-    }
-    await (0, sleep_1.sleep)(5000);
+    // SM Web Modeler ships no bundled marketplace connectors, so the
+    // change-element popup never offers the REST Outbound Connector and the
+    // template has to come from the marketplace.
+    await modelerCreatePage.clickMarketPlaceButton();
+    await connectorMarketplacePage.searchAndDownloadConnector('REST Connector');
     await page.reload();
-    await (0, sleep_1.sleep)(5000);
+    await page.waitForLoadState('networkidle');
     await modelerCreatePage.fillStartEventVariablesForDocHandling(zeebeUrl, zeebeClientId, zeebeClientSecret);
     await modelerCreatePage.setOAuthTokenEndpoint(page.locator('.djs-hit').first(), endpoint);
     await (0, sleep_1.sleep)(2000);

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

@@ -114,7 +114,8 @@ if (process.env.IS_DS === 'true') {
                 await operateProcessInstancePage.assertProcessVariableContainsText('Upload_Files', 'aws');
             });
         });
-        (0, SM_8_8_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_8_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.878",
+  "version": "0.0.880",
   "description": "End-to-end test helpers for Camunda 8",
   "repository": {
     "type": "git",