@camunda/e2e-test-suite 0.0.1089 → 0.0.1091

package/dist/pages/8.10/FormJsPage.js

@@ -148,7 +148,22 @@ class FormJsPage {
             .isVisible()
             .catch(() => false);
         if (!isLegacyDialog) {
-            await (0, test_1.expect)(this.dialog.getByText(clusterName, { exact: false }).first()).toBeVisible({ timeout: 30000 });
+            const offered = await this.dialog
+                .getByText(clusterName, { exact: false })
+                .first()
+                .waitFor({ state: 'visible', timeout: 30000 })
+                .then(() => true)
+                .catch(() => false);
+            if (!offered) {
+                // Forget the binding before failing. The dialog lists exactly the
+                // clusters this application's stages point at, so a missing cluster
+                // means the binding did not take -- and no amount of reopening the
+                // dialog will make it appear. Clearing the record lets the caller's
+                // next attempt rebind instead of re-checking an unchanged dialog.
+                this.processApplicationPage.forgetStageCluster();
+                throw new Error(`The deploy dialog does not offer "${clusterName}": its stage ` +
+                    'binding did not take. It will be rebound on the next attempt.');
+            }
             return;
         }
         const healthyRegex = new RegExp(`${clusterName}[\\s\\S]*?HealthydevManage`);
@@ -200,7 +215,25 @@ class FormJsPage {
         await (0, test_1.expect)(this.dialog).toBeVisible({
             timeout: 30000,
         });
-        await this.selectCluster(clusterName);
+        // selectCluster clears the stage binding when the dialog does not offer the
+        // cluster, so ensureStageCluster rebinds here and reports that it
+        // navigated. Any other failure leaves the binding in place, it returns
+        // false, and the original error stands. This path has no surrounding retry
+        // loop, hence the one explicit second attempt.
+        try {
+            await this.selectCluster(clusterName);
+        }
+        catch (error) {
+            const rebound = await this.processApplicationPage.ensureStageCluster(clusterName);
+            if (!rebound) {
+                throw error;
+            }
+            await this.clickDeployButton();
+            await (0, test_1.expect)(this.dialog).toBeVisible({
+                timeout: 30000,
+            });
+            await this.selectCluster(clusterName);
+        }
         await this.selectOnlyThisResource();
         await this.clickDeploySubButton();
         await (0, test_1.expect)(this.deploySuccessNotification).toBeVisible({ timeout: 30000 });

package/dist/pages/8.10/ProcessApplicationPage.d.ts

@@ -22,6 +22,7 @@ declare class ProcessApplicationPage {
     nameNewProcessApplication(name: string): Promise<void>;
     defineDevelopmentStage(clusterName?: string): Promise<void>;
     rememberResourceContainer(url: string): void;
+    forgetStageCluster(): void;
     ensureStageCluster(clusterName: string): Promise<boolean>;
     private openStageDefinition;
     openByName(name: string): Promise<void>;

package/dist/pages/8.10/ProcessApplicationPage.js

@@ -196,6 +196,18 @@ class ProcessApplicationPage {
     rememberResourceContainer(url) {
         resourceContainers.set(this.page, { url });
     }
+    // Drops the recorded development-stage binding so the next ensureStageCluster
+    // call binds again. Called when the deploy dialog turns out not to offer the
+    // cluster we believe we bound: the dialog offers exactly what the
+    // application's stages point at, so if the cluster is missing the binding
+    // did not take, and reopening the dialog can never change that. Without
+    // this, a caller's retries all re-check a state nothing is changing.
+    forgetStageCluster() {
+        const container = resourceContainers.get(this.page);
+        if (container) {
+            container.developmentCluster = undefined;
+        }
+    }
     // A process application deploys to the clusters bound to its stages, and
     // nothing else: inside a container DeployModal renders
     // ProcessAppClusterSelection, which lists only those and auto-selects the

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

@@ -21,6 +21,7 @@ declare class Authorization {
     protected readonly deleteAuthorizationModalDeleteButton: Locator;
     protected readonly tableFilter: Locator;
     constructor(page: Page);
+    protected selectResourceType(resourceType: string): Promise<void>;
     private selectAuthorizationOwner;
     createAuthorization(authorization: {
         ownerType: string;

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

@@ -98,6 +98,26 @@ class Authorization {
             .or(page.getByRole('searchbox', { name: 'Search by owner ID' }))
             .first();
     }
+    // The Admin's Authorizations page is migrating onto the new design-system
+    // shell, which replaces the per-resource-type tabs with a single
+    // "Authorization type" filter combobox (identity/client ListV2.tsx, gated on
+    // isNewDesignSystemEnabled). Select the resource type through whichever this
+    // build renders: click the tab, or open the combobox and pick the option.
+    async selectResourceType(resourceType) {
+        const tab = this.selectResourceTypeTab(resourceType);
+        const filterCombobox = this.page.getByRole('combobox', {
+            name: 'Authorization type',
+        });
+        await (0, test_1.expect)(tab.or(filterCombobox)).toBeVisible({ timeout: 60000 });
+        if (await tab.isVisible()) {
+            await tab.click();
+            return;
+        }
+        await filterCombobox.click();
+        await this.page
+            .getByRole('option', { name: resourceType, exact: true })
+            .click({ timeout: 30000 });
+    }
     // Released 8.10 alpha images still render the Carbon combobox that lists
     // every owner, so accept whichever owner field this build shows.
     async selectAuthorizationOwner(ownerId) {

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

@@ -2,34 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OCIdentityAuthorizationsPage = void 0;
 const Authorization_1 = require("../SM-8.10/Authorization");
-const test_1 = require("@playwright/test");
 class OCIdentityAuthorizationsPage extends Authorization_1.Authorization {
     constructor(page) {
         super(page);
     }
     async clickProcessDefinitionTab() {
-        await (0, test_1.expect)(this.selectResourceTypeTab('PROCESS_DEFINITION')).toBeVisible({
-            timeout: 60000,
-        });
-        await this.selectResourceTypeTab('PROCESS_DEFINITION').click();
+        await this.selectResourceType('PROCESS_DEFINITION');
     }
     async clickAuthorizationTab() {
-        await (0, test_1.expect)(this.selectResourceTypeTab('AUTHORIZATION')).toBeVisible({
-            timeout: 60000,
-        });
-        await this.selectResourceTypeTab('AUTHORIZATION').click();
+        await this.selectResourceType('AUTHORIZATION');
     }
     async clickComponentTab() {
-        await (0, test_1.expect)(this.selectResourceTypeTab('COMPONENT')).toBeVisible({
-            timeout: 60000,
-        });
-        await this.selectResourceTypeTab('COMPONENT').click();
+        await this.selectResourceType('COMPONENT');
     }
     async clickResourceTab() {
-        await (0, test_1.expect)(this.selectResourceTypeTab('RESOURCE')).toBeVisible({
-            timeout: 60000,
-        });
-        await this.selectResourceTypeTab('RESOURCE').click();
+        await this.selectResourceType('RESOURCE');
     }
 }
 exports.OCIdentityAuthorizationsPage = OCIdentityAuthorizationsPage;

package/package.json

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