@camunda/e2e-test-suite 0.0.1147 → 0.0.1149

package/dist/utils/modelerCluster.d.ts

@@ -1,9 +1,19 @@
 import { Locator } from '@playwright/test';
 /**
- * Selects the cluster named by MODELER_CLUSTER_NAME in a Web Modeler deploy dialog.
+ * Points a Web Modeler deploy dialog at the cluster named by MODELER_CLUSTER_NAME.
  *
  * No-op when the variable is unset, which is every single-cluster environment. In a topology one
  * Hub Web Modeler serves several orchestration clusters and preselects one of them, so a test that
  * does not choose deploys somewhere other than the release under test.
+ *
+ * Two dialog generations are in the field:
+ *
+ * - The legacy one offers a per-deploy cluster combobox labelled "Select a cluster".
+ * - Hub's stage-based one offers #cluster-selection-dropdown -- labelled "Stage", aria-label
+ *   "Select a stage" -- which lists only the clusters bound to the process application's stages
+ *   and arrives with the one ProcessApplicationPage.ensureStageCluster bound already selected.
+ *
+ * Hence keying the trigger on its id rather than its accessible name: the id says what the
+ * control is for and has survived the rename, the label is prose and did not.
  */
 export declare function selectModelerCluster(dialog: Locator): Promise<void>;

package/dist/utils/modelerCluster.js

@@ -3,28 +3,71 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.selectModelerCluster = void 0;
 const test_1 = require("@playwright/test");
 /**
- * Selects the cluster named by MODELER_CLUSTER_NAME in a Web Modeler deploy dialog.
+ * Points a Web Modeler deploy dialog at the cluster named by MODELER_CLUSTER_NAME.
  *
  * No-op when the variable is unset, which is every single-cluster environment. In a topology one
  * Hub Web Modeler serves several orchestration clusters and preselects one of them, so a test that
  * does not choose deploys somewhere other than the release under test.
+ *
+ * Two dialog generations are in the field:
+ *
+ * - The legacy one offers a per-deploy cluster combobox labelled "Select a cluster".
+ * - Hub's stage-based one offers #cluster-selection-dropdown -- labelled "Stage", aria-label
+ *   "Select a stage" -- which lists only the clusters bound to the process application's stages
+ *   and arrives with the one ProcessApplicationPage.ensureStageCluster bound already selected.
+ *
+ * Hence keying the trigger on its id rather than its accessible name: the id says what the
+ * control is for and has survived the rename, the label is prose and did not.
  */
 async function selectModelerCluster(dialog) {
     const modelerClusterName = process.env.MODELER_CLUSTER_NAME;
     if (!modelerClusterName) {
         return;
     }
-    const clusterSelect = dialog.getByRole('combobox', {
+    const page = dialog.page();
+    const stageSelect = dialog.locator('#cluster-selection-dropdown');
+    const legacySelect = dialog.getByRole('combobox', {
         name: 'Select a cluster',
     });
-    await clusterSelect.click();
-    const escapedClusterName = modelerClusterName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    // The option label carries a trailing " (<status>)", so anchor the name and allow that suffix.
-    await dialog
-        .getByRole('option', {
-        name: new RegExp(`^${escapedClusterName}(?: \\(|$)`),
-    })
-        .click();
+    // Wait on the union so whichever generation this dialog is settles the wait, instead of paying a
+    // full timeout probing the other one first.
+    const appeared = await stageSelect
+        .or(legacySelect)
+        .first()
+        .waitFor({ state: 'visible', timeout: 30000 })
+        .then(() => true)
+        .catch(() => false);
+    if (!appeared) {
+        throw new Error(`The deploy dialog offers no cluster selector, so "${modelerClusterName}" cannot be ` +
+            'chosen: neither #cluster-selection-dropdown (stage-based dialog) nor a "Select a ' +
+            'cluster" combobox (legacy dialog) became visible.');
+    }
+    const clusterSelect = (await stageSelect.isVisible().catch(() => false))
+        ? stageSelect
+        : legacySelect;
+    // The stage dialog arrives with the bound cluster already selected, so the usual outcome is that
+    // nothing is clicked at all. That is not just a saved click: the option list unmounts on the
+    // click that lands, so every open is a chance to lose that race.
+    const selected = (await clusterSelect.textContent()) ?? '';
+    if (!selected.includes(modelerClusterName)) {
+        await clusterSelect.click();
+        const escapedClusterName = modelerClusterName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        // A stage option's accessible name is "<stage><cluster> (<generation>)" -- the stage and the
+        // cluster sit in adjacent spans with no whitespace between them, so it reads
+        // "DevelopmentOrchestration A (8.10.0-alpha3)" and the cluster name is not at a word
+        // boundary. A legacy option is just "<cluster> (<status>)". Anchoring the start therefore
+        // matches neither reliably; the trailing " (" is what keeps the match honest, and is enough
+        // on its own to tell "Orch" from "Orchestration A".
+        const optionName = new RegExp(`${escapedClusterName}(?:\\s*\\(|$)`);
+        // The stage select is a Radix UI Select: its listbox is portalled to document.body, OUTSIDE
+        // the dialog element, so a dialog-scoped option query never resolves even while the option is
+        // visible on screen. Query at page scope; the trigger above stays dialog-scoped because it
+        // renders inside the dialog.
+        await page
+            .getByRole('option', { name: optionName })
+            .first()
+            .click({ timeout: 30000 });
+    }
     await (0, test_1.expect)(clusterSelect).toContainText(modelerClusterName);
 }
 exports.selectModelerCluster = selectModelerCluster;

package/package.json

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