@camunda/e2e-test-suite 0.0.1634 → 0.0.1636

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

@@ -58,6 +58,7 @@ declare class ConsoleOrganizationPage {
     clickSettingsTab(): Promise<void>;
     clickOptInButton(): Promise<void>;
     enableAlphaFeature(name: string): Promise<void>;
+    acceptTerms(checkbox: Locator): Promise<void>;
     closeTermsDialog(): Promise<void>;
     scrollToOptInCheckbox(): Promise<void>;
     checkOptInCheckbox(): Promise<void>;

package/dist/pages/8.10/ConsoleOrganizationPage.js

@@ -305,7 +305,7 @@ class ConsoleOrganizationPage {
                 await alphaFeatureOptInButton.click({ timeout: 90000 });
                 await (0, test_1.expect)(this.dialog.first()).toBeVisible({ timeout: 60000 });
                 await this.scrollToOptInCheckbox();
-                await this.optInAICheckbox.check({ timeout: 90000 });
+                await this.acceptTerms(this.optInAICheckbox);
                 await this.closeTermsDialog();
             }
         }
@@ -326,14 +326,33 @@ class ConsoleOrganizationPage {
         await toggle.click();
         await (0, test_1.expect)(toggle).toBeChecked({ timeout: 60000 });
     }
+    // Ticking the terms checkbox records the acceptance with PactSafe
+    // (POST pactsafe.io/send). Closing the dialog or reloading the page before
+    // that request completes aborts it, so the opt-in is silently lost and the
+    // Opt-in button never goes away. Wait for the acceptance to be recorded.
+    async acceptTerms(checkbox) {
+        await Promise.all([
+            this.page.waitForResponse((response) => response.url().includes('pactsafe.io/send') &&
+                response.request().method() === 'POST' &&
+                response.ok(), { timeout: 60000 }),
+            checkbox.check({ timeout: 90000 }),
+        ]);
+    }
     async closeTermsDialog() {
-        const closeButton = this.dialog
-            .first()
-            .getByRole('button', { name: 'Close' });
-        if (await closeButton.isVisible({ timeout: 10000 }).catch(() => false)) {
-            await closeButton.click();
+        const dialog = this.dialog.first();
+        // Console closes the terms dialog itself once the acceptance is recorded;
+        // only fall back to the Close button if it stays open.
+        const closedByItself = await dialog
+            .waitFor({ state: 'hidden', timeout: 30000 })
+            .then(() => true)
+            .catch(() => false);
+        if (!closedByItself) {
+            const closeButton = dialog.getByRole('button', { name: 'Close' });
+            if (await closeButton.isVisible()) {
+                await closeButton.click();
+            }
         }
-        await (0, test_1.expect)(this.dialog.first()).toBeHidden({ timeout: 60000 });
+        await (0, test_1.expect)(dialog).toBeHidden({ timeout: 60000 });
     }
     async scrollToOptInCheckbox() {
         const dialog = this.dialog.first();
@@ -395,14 +414,34 @@ class ConsoleOrganizationPage {
         if (!(await this.optInButton.isVisible({ timeout: 30000 }).catch(() => false))) {
             return;
         }
-        await this.clickOptInButton();
-        await (0, test_1.expect)(this.dialog.first()).toBeVisible({ timeout: 60000 });
+        // The Opt-in click can land before the button's handler is ready, in
+        // which case no terms dialog opens; retry the click until it does.
+        await (0, expectLocatorWithRetry_1.expectLocatorWithRetry)(this.page, this.dialog.first(), {
+            visibilityTimeout: 30000,
+            totalTimeout: 180000,
+            maxRetries: 3,
+            preAction: async () => {
+                if (!(await this.dialog.first().isVisible())) {
+                    await this.clickOptInButton();
+                }
+            },
+            postAction: async () => {
+                await this.page.reload();
+                await this.clickSettingsTab();
+            },
+        });
         await this.scrollToOptInCheckbox();
-        await this.optInCheckbox.check({ timeout: 90000 });
+        await this.acceptTerms(this.optInCheckbox);
         await this.closeTermsDialog();
-        await this.page.reload();
-        await this.clickSettingsTab();
-        await (0, test_1.expect)(this.optInButton).not.toBeVisible({ timeout: 60000 });
+        // Reload, settings-table readiness and button absence are retried
+        // together, so a Settings page that failed to load can never count as
+        // "Opt-in button gone".
+        await (0, test_1.expect)(async () => {
+            await this.page.reload();
+            await this.clickSettingsTab();
+            await (0, test_1.expect)(this.rows.first()).toBeVisible({ timeout: 60000 });
+            await (0, test_1.expect)(this.optInButton).toBeHidden({ timeout: 60000 });
+        }).toPass({ timeout: 180000 });
     }
     async clickGroupsTab() {
         await this.groupsTab.click({ timeout: 60000 });

package/package.json

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