@camunda/e2e-test-suite 0.0.833 → 0.0.835

package/dist/pages/8.7/ClusterPage.js

@@ -100,12 +100,17 @@ class ClusterPage {
         this.clustersList = page
             .getByRole('row')
             .filter({ hasNotText: 'Generation' }); //Filter out header row
-        this.cluster = (clusterName) => this.clustersList.filter({ hasText: clusterName }).first();
+        this.cluster = (clusterName) => this.clustersList
+            .filter({
+            has: page.getByRole('link', { name: clusterName, exact: true }),
+        })
+            .first();
         this.clusterHealthiness = (clusterName) => this.cluster(clusterName).getByText(`Healthy`, {
             exact: true,
         });
         this.clusterLink = (clusterName) => this.cluster(clusterName).getByRole('link', {
             name: clusterName,
+            exact: true,
         });
     }
     async clickClusterBanner() {

package/dist/pages/8.7/FormJsPage.js

@@ -105,7 +105,7 @@ class FormJsPage {
         await cluster.click();
         await (0, test_1.expect)(this.dialog
             .locator('label')
-            .filter({ hasText: clusterName })
+            .filter({ hasText: new RegExp(`^${clusterName}`) })
             .getByRole('switch')).toBeChecked({ timeout: 30000 });
         await (0, test_1.expect)(this.dialog).toHaveText(healthyRegex, {
             timeout: healthCheckTimeout,

package/dist/pages/8.7/ModelerCreatePage.js

@@ -446,17 +446,14 @@ class ModelerCreatePage {
             timeout: 30000,
         });
         //Select the correct cluster if multiple exist
-        const cluster = this.deployDiagramDialog.getByText(clusterName);
-        await (0, test_1.expect)(cluster).toBeVisible({
+        const clusterLabel = this.deployDiagramDialog
+            .locator('label')
+            .filter({ hasText: new RegExp(`^${clusterName}`) });
+        await (0, test_1.expect)(clusterLabel).toBeVisible({ timeout: 30000 });
+        await clusterLabel.click();
+        await (0, test_1.expect)(clusterLabel.getByRole('switch')).toBeChecked({
             timeout: 30000,
         });
-        await cluster.click();
-        await (0, test_1.expect)(this.deployDiagramDialog
-            .locator('label')
-            .filter({
-            hasText: clusterName,
-        })
-            .getByRole('switch')).toBeChecked({ timeout: 30000 });
         //Check healthy status of the selected cluster
         const regex = new RegExp(`${clusterName}.*?HealthydevManage`);
         await (0, test_1.expect)(this.deployDiagramDialog).toHaveText(regex, {
@@ -498,17 +495,14 @@ class ModelerCreatePage {
             timeout: 30000,
         });
         //Select the correct cluster if multiple exist
-        const cluster = this.dialog.getByText(clusterName);
-        await (0, test_1.expect)(cluster).toBeVisible({
+        const clusterLabel = this.dialog
+            .locator('label')
+            .filter({ hasText: new RegExp(`^${clusterName}`) });
+        await (0, test_1.expect)(clusterLabel).toBeVisible({ timeout: 30000 });
+        await clusterLabel.click();
+        await (0, test_1.expect)(clusterLabel.getByRole('switch')).toBeChecked({
             timeout: 30000,
         });
-        await cluster.click();
-        await (0, test_1.expect)(this.dialog
-            .locator('label')
-            .filter({
-            hasText: clusterName,
-        })
-            .getByRole('switch')).toBeChecked({ timeout: 30000 });
         //Check healthy status of the selected cluster
         const regex = new RegExp(`${clusterName}.*?HealthydevManage`);
         await (0, test_1.expect)(this.dialog).toHaveText(regex, {
@@ -1068,7 +1062,7 @@ class ModelerCreatePage {
                 // before saving. This handles environments with multiple clusters.
                 const clusterLabel = configureEnvDialog
                     .locator('label')
-                    .filter({ hasText: clusterName });
+                    .filter({ hasText: new RegExp(`^${clusterName}`) });
                 const clusterSwitch = clusterLabel.getByRole('switch');
                 await (0, test_1.expect)(clusterLabel).toBeVisible({ timeout });
                 const alreadyChecked = (await clusterSwitch.getAttribute('aria-checked')) === 'true';
@@ -1118,13 +1112,14 @@ class ModelerCreatePage {
         await (0, test_1.expect)(this.dialog).toBeVisible({ timeout: 30000 });
         const healthCheckTimeout = 30000;
         const healthyRegex = new RegExp(`${clusterName}.*?HealthydevManage`);
-        const cluster = this.dialog.getByText(clusterName);
-        await (0, test_1.expect)(cluster).toBeVisible({ timeout: 30000 });
-        await cluster.click();
-        await (0, test_1.expect)(this.dialog
+        const clusterLabel = this.dialog
             .locator('label')
-            .filter({ hasText: clusterName })
-            .getByRole('switch')).toBeChecked({ timeout: 30000 });
+            .filter({ hasText: new RegExp(`^${clusterName}`) });
+        await (0, test_1.expect)(clusterLabel).toBeVisible({ timeout: 30000 });
+        await clusterLabel.click();
+        await (0, test_1.expect)(clusterLabel.getByRole('switch')).toBeChecked({
+            timeout: 30000,
+        });
         await (0, test_1.expect)(this.dialog).toHaveText(healthyRegex, {
             timeout: healthCheckTimeout,
         });

package/dist/pages/8.7/ModelerHomePage.js

@@ -109,7 +109,7 @@ class ModelerHomePage {
     }
     async selectCluster(clusterName) {
         //Select the correct cluster if multiple exist
-        const cluster = this.dialog.getByText(clusterName);
+        const cluster = this.dialog.getByText(new RegExp(`^${clusterName}`));
         await (0, test_1.expect)(cluster).toBeVisible({
             timeout: 30000,
         });
@@ -117,7 +117,7 @@ class ModelerHomePage {
         await (0, test_1.expect)(this.dialog
             .locator('label')
             .filter({
-            hasText: clusterName,
+            hasText: new RegExp(`^${clusterName}`),
         })
             .getByRole('switch')).toBeChecked({ timeout: 30000 });
         //Check healthy status of the selected cluster

package/dist/tests/8.7/console-user-flows.spec.js

@@ -22,6 +22,17 @@ _8_7_1.test.describe('Console User Flow Tests', () => {
         await (0, _setup_1.captureScreenshot)(page, testInfo);
         await (0, _setup_1.captureFailureVideo)(page, testInfo);
     });
+    (0, _8_7_1.test)('Create Cluster', async ({ homePage, clusterPage }) => {
+        _8_7_1.test.slow();
+        const newClusterName = 'UI Test Cluster';
+        await _8_7_1.test.step('Navigate to clusters and create cluster', async () => {
+            await homePage.clickClusters();
+            await clusterPage.createCluster(newClusterName);
+        });
+        await _8_7_1.test.step('Assert cluster is healthy', async () => {
+            await clusterPage.assertClusterHealthyStatusWithRetry(newClusterName, 300000, 1500000);
+        });
+    });
     //Waiting infra team to provide DNS configuration for email testing, skipping for now
     _8_7_1.test.skip('Alert Trigger Flow - Email Notification', async ({ page, homePage, modelerHomePage, appsPage, modelerCreatePage, clusterPage, clusterDetailsPage, connectorSettingsPage, }) => {
         _8_7_1.test.slow();

package/dist/tests/8.7/test-setup.spec.js

@@ -5,6 +5,7 @@ const _8_7_1 = require("../../fixtures/8.7");
 const _setup_1 = require("../../test-setup.js");
 const UtilitiesPage_1 = require("../../pages/8.7/UtilitiesPage");
 const users_1 = require("../../utils/users");
+const consoleApiHelpers_1 = require("../../utils/consoleApiHelpers");
 _8_7_1.test.describe.configure({ mode: 'parallel' });
 _8_7_1.test.describe('Cluster Setup Tests', () => {
     _8_7_1.test.afterEach(async ({ page }, testInfo) => {
@@ -23,9 +24,16 @@ _8_7_1.test.describe('Cluster Setup Tests', () => {
         _8_7_1.test.slow();
         const clusterName = 'Test Cluster';
         await (0, UtilitiesPage_1.loginWithRetry)(page, loginPage, users_1.testUsers.mainUser, (testInfo.workerIndex + 1) * 1000);
-        await homePage.clickClusters();
-        await clusterPage.createCluster(clusterName);
-        await clusterPage.assertClusterHealthyStatusWithRetry(clusterName);
+        if (process.env.IS_PROD === 'true') {
+            await clusterPage.createCluster(clusterName);
+            await clusterPage.assertClusterHealthyStatusWithRetry(clusterName);
+        }
+        else {
+            await (0, consoleApiHelpers_1.deleteClusterViaApi)(page, clusterName);
+            const clusterUuid = await (0, consoleApiHelpers_1.createClusterViaApi)(page, clusterName);
+            await (0, consoleApiHelpers_1.waitForClusterHealthyViaApi)(page, clusterUuid);
+            await homePage.clickClusters();
+        }
         await clusterPage.clickClusterLink(clusterName);
         await clusterDetailsPage.assertComponentsHealth();
     });
@@ -34,10 +42,17 @@ _8_7_1.test.describe('Cluster Setup Tests', () => {
         _8_7_1.test.slow();
         const clusterName = 'AWS Cluster';
         await (0, UtilitiesPage_1.loginWithRetry)(page, loginPage, users_1.testUsers.mainUser, (testInfo.workerIndex + 1) * 1000);
-        await homePage.clickClusters();
-        await clusterPage.createCluster(clusterName, 'AWS');
-        // AWS clusters on SaaS INT routinely need 10+ min to reach Healthy.
-        await clusterPage.assertClusterHealthyStatusWithRetry(clusterName, 300000, 1500000);
+        if (process.env.IS_PROD === 'true') {
+            await clusterPage.createCluster(clusterName, 'AWS');
+            // AWS clusters on SaaS INT routinely need 10+ min to reach Healthy.
+            await clusterPage.assertClusterHealthyStatusWithRetry(clusterName, 300000, 1500000);
+        }
+        else {
+            await (0, consoleApiHelpers_1.deleteClusterViaApi)(page, clusterName);
+            const clusterUuid = await (0, consoleApiHelpers_1.createClusterViaApi)(page, clusterName, 'AWS');
+            await (0, consoleApiHelpers_1.waitForClusterHealthyViaApi)(page, clusterUuid, 1500000);
+            await homePage.clickClusters();
+        }
         await clusterPage.clickClusterLink(clusterName);
         await clusterDetailsPage.assertComponentsHealth();
     });

package/dist/utils/consoleApiHelpers.js

@@ -84,19 +84,34 @@ async function deleteClusterViaApi(page, clusterName) {
 }
 exports.deleteClusterViaApi = deleteClusterViaApi;
 async function resolveGenerationId() {
-    const rawVersion = process.env.CLUSTER_VERSION ?? '';
+    // MINOR_VERSION is always a plain "8.x" string in every trigger flow
+    // (run-tests-saas extracts it from the human-readable version input;
+    // run-tests-smoke-int sets it straight from c8Version). CLUSTER_VERSION is
+    // NOT reliable for this lookup: the camunda/camunda-triggered PR dispatch
+    // flow (playwright_saas_pr_trigger_monorepo.yml -> run-tests-smoke-int)
+    // deliberately puts a random per-PR cluster *generation name* there
+    // (openssl rand -hex 6), a pre-existing convention unrelated to this
+    // GENERATION_MAP lookup. Fall back to it only for callers that don't set
+    // MINOR_VERSION.
+    const rawVersion = process.env.MINOR_VERSION || process.env.CLUSTER_VERSION || '';
     const minorVersion = rawVersion.match(/^(\d+\.\d+)/)?.[1] ?? rawVersion;
     const generationId = GENERATION_MAP[minorVersion];
     if (generationId)
         return generationId;
-    throw new Error(`No generation UUID found for CLUSTER_VERSION="${rawVersion}" ` +
+    throw new Error(`No generation UUID found for MINOR_VERSION/CLUSTER_VERSION="${rawVersion}" ` +
         `(resolved minor: "${minorVersion}"). ` +
         `Known versions: ${Object.keys(GENERATION_MAP).join(', ')}`);
 }
 async function createClusterViaApi(page, clusterName, region = 'GCP') {
     const token = await getUserToken(page);
     const orgId = getOrgId();
-    const generationId = await resolveGenerationId();
+    // Some trigger flows (e.g. playwright_saas_pr_trigger_monorepo.yml) create a
+    // throwaway cluster generation per run, built from that specific commit's
+    // component images, and pass its real UUID through as CLUSTER_GENERATION_ID.
+    // That must win over the static GENERATION_MAP lookup -- falling back to a
+    // fixed generation would silently test the wrong (stale) images instead of
+    // failing loudly.
+    const generationId = process.env.CLUSTER_GENERATION_ID || (await resolveGenerationId());
     const k8sContextId = region.toUpperCase() === 'AWS' ? AWS_REGION_ID : GCP_REGION_ID;
     const createResponse = await page.request.post(`${getConsoleBaseUrl()}/api/orgs/${orgId}/clusters`, {
         headers: { Authorization: `Bearer ${token}` },

package/package.json

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