@camunda/e2e-test-suite 0.0.10 → 0.0.12

package/dist/pages/SM-8.7/IdentityTenantPage.d.ts

@@ -20,6 +20,7 @@ declare class IdentityTenantPage {
     readonly rows: Locator;
     readonly confirmDeleteInput: Locator;
     readonly dangerDeleteButton: Locator;
+    readonly cancelButton: Locator;
     constructor(page: Page);
     clickCreateTenantMainButton(): Promise<void>;
     clickCreateTenantSubButton(): Promise<void>;

package/dist/pages/SM-8.7/IdentityTenantPage.js

@@ -24,6 +24,7 @@ class IdentityTenantPage {
     rows;
     confirmDeleteInput;
     dangerDeleteButton;
+    cancelButton;
     constructor(page) {
         this.page = page;
         this.createTenantMainButton = page.getByRole('button', {
@@ -60,6 +61,7 @@ class IdentityTenantPage {
             name: 'Type the word DELETE to confirm',
         });
         this.dangerDeleteButton = page.getByRole('button', { name: 'danger Delete' });
+        this.cancelButton = page.getByRole('button', { name: 'Cancel' });
     }
     async clickCreateTenantMainButton() {
         await this.createTenantMainButton.click({ timeout: 60000 });
@@ -102,6 +104,7 @@ class IdentityTenantPage {
     }
     async createTenant(tenantName) {
         await this.page.waitForLoadState('networkidle');
+        await (0, sleep_1.sleep)(1000);
         const tenant = this.rows.filter({ hasText: tenantName }).first();
         // Check if the tenant already exists. If so, we're done.
         if (await tenant.isVisible({ timeout: 5000 })) {
@@ -117,10 +120,27 @@ class IdentityTenantPage {
         // After attempting to create, we expect either a success message,
         // or for the tenant to now be in the list (in case of a race condition
         // where another process created it).
-        const successMessage = this.page.getByText('Tenant created');
-        await (0, test_1.expect)(successMessage.or(tenant)).toBeVisible({
-            timeout: 10000,
-        });
+        const toast = this.page.getByText('Tenant created');
+        const errorToast = this.page.getByText('An error occurred');
+        const row = this.page.getByRole('row', { name: tenantName });
+        const result = await Promise.race([
+            toast.waitFor({ state: 'visible', timeout: 10000 }).then(() => 'Tenant Created'),
+            row.waitFor({ state: 'visible', timeout: 10000 }).then(() => 'Tenant Created'),
+            errorToast.waitFor({ state: 'visible', timeout: 10000 }).then(() => 'Tenant Creation Failed'),
+        ]);
+        if (result === 'Tenant Created') {
+            console.log(`Tenant ${tenantName} created.`);
+            return;
+        }
+        else if (result === 'Tenant Creation Failed') {
+            console.log(`Tenant ${tenantName} already exists.`);
+            await this.cancelButton.click();
+            await this.page.reload;
+            return;
+        }
+        else {
+            throw new Error(`Unknown error creating tenant ${tenantName}`);
+        }
     }
     async deleteTenant(tenantName, tenant) {
         console.log(`Tenant ${tenantName} already exists, deleting.`);
@@ -139,6 +159,7 @@ class IdentityTenantPage {
         }
     }
     async assignUserToTenant(tenantName, user, userEmail) {
+        await this.page.reload();
         const tenant = this.rows.filter({ hasText: tenantName }).first();
         await (0, test_1.expect)(tenant).toBeVisible();
         await tenant.click();

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

@@ -454,11 +454,11 @@ class ModelerCreatePage {
                 if (attempt > 1) {
                     await this.page.reload();
                 }
-                if (await this.startInstanceMainButton.isVisible({ timeout: 30000 })) {
-                    await this.startInstanceMainButton.click({ timeout: 30000 });
+                if (await this.startInstanceMainButton.isVisible({ timeout: 3000 })) {
+                    await this.startInstanceMainButton.click({ timeout: 3000 });
                 }
                 else {
-                    await this.deployAndRunMainButton.click({ timeout: 30000 }); //will be available from alpha7
+                    await this.deployAndRunMainButton.click({ timeout: 3000 }); //will be available from alpha7
                 }
                 return;
             }

package/dist/pages/SM-8.7/NavigationPage.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NavigationPage = void 0;
 const test_1 = require("@playwright/test");
 const LoginPage_1 = require("./LoginPage");
-const randomSleep_1 = require("../../utils/randomSleep");
 const sleep_1 = require("../../utils/sleep");
 const constants_1 = require("../../utils/constants");
 class NavigationPage {
@@ -60,37 +59,38 @@ class NavigationPage {
                 if (sleepTimeout) {
                     await (0, sleep_1.sleep)(sleepTimeout);
                 }
-                await this.page.goto(url, { timeout: constants_1._1_SECOND_IN_MS * 10 });
+                await this.page.goto(url, { timeout: 10000 });
                 const loginPage = new LoginPage_1.LoginPage(this.page);
-                const isLogin = await Promise.race([
-                    loginPage.isLoginPage(),
-                    (0, sleep_1.sleep)(timeout) // the sleep here is a delay to allow the login page to load so that the race is a fair race
-                        .then(async () => {
-                        try {
-                            await (0, test_1.expect)(banner).toBeVisible({
-                                timeout: constants_1._1_SECOND_IN_MS * 2,
-                            });
-                            return false;
-                        }
-                        catch {
-                            return true;
-                        }
-                    }),
-                ]);
-                if (isLogin) {
-                    if (!this.activeUser) {
-                        console.error('Fatal error, shutting down.');
-                        process.exit(1);
+                const loginSelector = loginPage.usernameInput; // Or another unique, stable selector
+                // 1. Wait for either the banner or the login page to appear first.
+                await (0, test_1.expect)(banner.or(loginSelector)).toBeVisible({ timeout: 15000 });
+                // 2. Now, check which one it was.
+                const isBannerVisible = await banner.isVisible();
+                if (isBannerVisible) {
+                    // The banner is visible. This MIGHT be the page that redirects.
+                    // We'll wait a few seconds to see if it "corrects itself" to the login page.
+                    try {
+                        // Wait specifically for the login page selector to appear.
+                        await (0, test_1.expect)(loginSelector).toBeVisible({ timeout: 5000 });
+                        // If we get here, a redirect occurred. Now we log in.
+                        await loginPage.login(this.activeUser, this.activePassword);
                     }
+                    catch (error) {
+                        // The login selector did NOT appear. The banner is real. We are on the correct page.
+                        // The navigation was successful, so we can just return.
+                    }
+                }
+                else {
+                    // The login page was visible from the start.
                     await loginPage.login(this.activeUser, this.activePassword);
                 }
-                return;
+                return; // End of successful navigation/login
             }
             catch (error) {
                 const now = new Date();
                 const elapsed = Date.now() - startTime;
                 if (attempt < maxRetries - 1) {
-                    await (0, randomSleep_1.randomSleep)(15000, 30000);
+                    await (0, sleep_1.sleep)(5000);
                     if (!this.page.isClosed()) {
                         try {
                             await this.page.waitForLoadState('load', { timeout: timeout });

package/dist/tests/SM-8.7/smoke-tests.spec.js

@@ -10,17 +10,20 @@ const optimizeReportUtils_1 = require("./optimizeReportUtils");
 const loggingUtils_1 = require("../../utils/loggingUtils");
 SM_8_7_1.test.describe.parallel('Smoke Tests', () => {
     SM_8_7_1.test.beforeEach(async ({ navigationPage, identityPage, identityTenantPage, keycloakLoginPage, keycloakAdminPage, }, testInfo) => {
+        console.log('TIMEOUT: ' + testInfo.timeout);
         (0, loggingUtils_1.setupTestLogging)(testInfo);
         await (0, keycloak_1.setupKeycloakUser)(navigationPage, identityPage, keycloakLoginPage, keycloakAdminPage, identityTenantPage);
         if (process.env.IS_MT === 'true') {
             const mt_connectors_tenant = [
+                'default',
                 'Tenant_Main_Connectors',
                 'Tenant_Second_Connectors',
                 'Tenant_1_Connectors',
                 'Tenant_2_Connectors',
             ];
+            await navigationPage.goToIdentity();
             for (const tenant of mt_connectors_tenant) {
-                await navigationPage.goToIdentity();
+                await identityPage.clickTenantTab();
                 await identityTenantPage.createTenant(tenant);
                 await identityTenantPage.assignUserToTenant(tenant, navigationPage.activeUser, navigationPage.activeUser + '@camunda.com');
                 await identityTenantPage.assignClientToTenant('Zeebe');
@@ -28,6 +31,7 @@ SM_8_7_1.test.describe.parallel('Smoke Tests', () => {
         }
     });
     SM_8_7_1.test.afterEach(async ({ page }, testInfo) => {
+        console.log('TIMEOUT: ' + testInfo.timeout);
         await (0, _setup_1.captureScreenshot)(page, testInfo);
         await (0, _setup_1.captureFailureVideo)(page, testInfo);
         (0, loggingUtils_1.cleanupTestLogging)();
@@ -35,7 +39,7 @@ SM_8_7_1.test.describe.parallel('Smoke Tests', () => {
     (0, SM_8_7_1.test)('Basic Login', async ({ context, identityPage, navigationPage }) => {
         await context.clearCookies();
         await navigationPage.goToIdentity(1000);
-        await (0, test_1.expect)(identityPage.identityBanner).toBeVisible({ timeout: 120000 });
+        await (0, test_1.expect)(identityPage.identityBanner).toBeVisible({ timeout: 10000 });
     });
     (0, SM_8_7_1.test)('Basic Navigation', async ({ context, navigationPage }) => {
         await SM_8_7_1.test.step('Assert Web Modeler Navigation', async () => {

package/dist/utils/keycloak.js

@@ -63,8 +63,4 @@ const createIdentityUser = async (navigationPage, identityPage, identityTenantPa
     await identityPage.clickIdentityCheckbox();
     await identityPage.clickModelerAdminCheckbox();
     await identityPage.clickAddButton();
-    if (process.env.IS_MT === 'true') {
-        await identityPage.clickTenantTab();
-        await identityTenantPage.assignUserToTenant('default', username, username + '@camunda.com');
-    }
 };

package/package.json

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