@camunda/e2e-test-suite 0.0.478 → 0.0.480

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

@@ -23,15 +23,17 @@ class LoginPage {
         this.coreLoginButton = page.getByRole('button', { name: 'Login' });
         this.keycloakBanner = page.locator('body#keycloak-bg[data-page-id="login-login"]');
     }
-    // Race logic: call before interacting
     async detectLoginForm() {
-        const winner = await Promise.race([
-            this.usernameInput.waitFor({ state: 'visible' }).then(() => 'default'),
-            this.coreUsernameInput.waitFor({ state: 'visible' }).then(() => 'core'),
-            this.keycloakBanner.waitFor({ state: 'visible' }).then(() => 'keycloak'),
-        ]);
-        this.useCore = winner === 'core';
-        this.useKeycloak = winner === 'keycloak';
+        const anyForm = this.usernameInput
+            .or(this.coreUsernameInput)
+            .or(this.keycloakBanner);
+        await anyForm.waitFor({ state: 'visible', timeout: 15000 });
+        if (await this.coreUsernameInput.isVisible()) {
+            this.useCore = true;
+        }
+        else if (await this.keycloakBanner.isVisible()) {
+            this.useKeycloak = true;
+        }
     }
     async fillUsername(username) {
         if (await this.page.locator('#username').isVisible()) {

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelerHomePage = void 0;
 const test_1 = require("@playwright/test");
-const sleep_1 = require("../../utils/sleep");
 const expectLocatorWithRetry_1 = require("../../utils/assertionHelpers/expectLocatorWithRetry");
 class ModelerHomePage {
     page;
@@ -75,13 +74,14 @@ class ModelerHomePage {
         await this.createNewProjectButton.click();
     }
     async enterNewProjectName(name) {
-        await (0, sleep_1.sleep)(1000);
+        await (0, test_1.expect)(this.projectNameInput).toBeVisible({ timeout: 10000 });
         await this.projectNameInput.click({ timeout: 60000 });
         await this.projectNameInput.fill(name);
         await this.projectNameInput.press('Enter');
     }
     async createCrossComponentProjectFolder() {
-        await (0, sleep_1.sleep)(10000);
+        await this.page.waitForLoadState('networkidle');
+        await (0, test_1.expect)(this.createNewProjectButton).toBeVisible({ timeout: 30000 });
         await this.clickMessageBanner();
         if (await this.crossComponentProjectFolder.isVisible()) {
             console.log('Cross Component Project folder already exists. Clicking into it');
@@ -90,7 +90,7 @@ class ModelerHomePage {
         }
         await this.clickCreateNewProjectButton();
         await this.enterNewProjectName(this.defaultFolderName);
-        await (0, sleep_1.sleep)(5000);
+        await (0, test_1.expect)(this.page.getByRole('heading', { name: this.defaultFolderName })).toBeVisible({ timeout: 10000 });
     }
     async clickCrossComponentProjectFolder() {
         let attempts = 0;
@@ -109,7 +109,7 @@ class ModelerHomePage {
                 if (attempts < maxAttempts) {
                     console.log(`Attempt ${attempts} failed. Reloading page and retrying...`);
                     await this.page.reload();
-                    await (0, sleep_1.sleep)(10000);
+                    await this.page.waitForLoadState('domcontentloaded');
                 }
                 else {
                     throw new Error('Failed to click crossComponentProjectFolder after 3 attempts.');
@@ -149,7 +149,7 @@ class ModelerHomePage {
         await this.formTemplateOption.click();
     }
     async enterFormName(name) {
-        await (0, sleep_1.sleep)(1000);
+        await (0, test_1.expect)(this.formNameInput).toBeVisible({ timeout: 10000 });
         await this.formNameInput.click({ timeout: 60000 });
         await this.formNameInput.fill(name);
         await this.formNameInput.press('Enter');
@@ -168,10 +168,13 @@ class ModelerHomePage {
     }
     async clickMessageBanner() {
         try {
-            await Promise.race([
-                this.messageBanner.click(),
-                this.closeButton.click(),
-            ]);
+            const banner = this.messageBanner.or(this.closeButton);
+            if (await banner.isVisible({ timeout: 2000 })) {
+                await banner.click();
+            }
+            else {
+                console.log('No banner or close button found to click');
+            }
         }
         catch {
             console.log('No banner or close button found to click');

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

@@ -77,14 +77,11 @@ class NavigationPage {
                 await (0, test_1.expect)(loginEntryPoint).toBeVisible({ timeout: 30000 });
                 const isBannerVisible = await banner.isVisible().catch(() => false);
                 if (isBannerVisible) {
-                    try {
-                        await (0, test_1.expect)(loginPage.usernameInput).toBeVisible({ timeout: 5000 });
+                    const loginVisible = await loginPage.usernameInput.isVisible();
+                    if (loginVisible) {
                         await loginPage.login(username, password);
                     }
-                    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.
-                    }
+                    // If login selector not visible, banner is real - navigation succeeded
                 }
                 else {
                     await loginPage.login(username, password);
@@ -96,7 +93,7 @@ class NavigationPage {
                 const now = new Date();
                 const elapsed = Date.now() - startTime;
                 if (attempt < maxRetries - 1) {
-                    await (0, sleep_1.sleep)(5000);
+                    await (0, sleep_1.sleep)(2000);
                     if (!this.page.isClosed()) {
                         try {
                             await this.page.waitForLoadState('load', { timeout: timeout });

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

@@ -50,7 +50,7 @@ class OperateProcessInstancePage {
                 retryCount++;
                 console.log(`Attempt ${retryCount} failed. Retrying...`);
                 await this.page.reload();
-                await (0, sleep_1.sleep)(10000);
+                await this.page.waitForLoadState('domcontentloaded');
             }
         }
         throw new Error(`Active icon not visible after ${maxRetries} attempts.`);
@@ -70,7 +70,7 @@ class OperateProcessInstancePage {
                 retryCount++;
                 console.log(`Attempt ${retryCount} failed. Retrying...`);
                 await this.page.reload();
-                await (0, sleep_1.sleep)(10000);
+                await this.page.waitForLoadState('domcontentloaded');
             }
         }
         throw new Error(`Active icon not visible after ${maxRetries} attempts.`);
@@ -90,7 +90,7 @@ class OperateProcessInstancePage {
                 retryCount++;
                 console.log(`Attempt ${retryCount} failed. Retrying...`);
                 await this.page.reload();
-                await (0, sleep_1.sleep)(10000);
+                await this.page.waitForLoadState('domcontentloaded');
             }
         }
         throw new Error(`Active icon not visible after ${maxRetries} attempts.`);
@@ -110,7 +110,7 @@ class OperateProcessInstancePage {
                 retryCount++;
                 console.log(`Attempt ${retryCount} failed. Retrying...`);
                 await this.page.reload();
-                await (0, sleep_1.sleep)(10000);
+                await this.page.waitForLoadState('domcontentloaded');
             }
         }
         throw new Error(`Active icon visible after ${maxRetries} attempts.`);
@@ -122,16 +122,18 @@ class OperateProcessInstancePage {
         await (0, test_1.expect)(this.incidentIcon).toBeVisible({ timeout: 90000 });
     }
     async assertEitherIncidentOrActiveIconVisible() {
-        return Promise.race([
-            this.incidentIcon.waitFor({ timeout: 90000 }).then(() => 'incident'),
-            this.activeIcon.waitFor({ timeout: 90000 }).then(() => 'active'),
-        ]);
+        const either = this.incidentIcon.or(this.activeIcon);
+        await (0, test_1.expect)(either).toBeVisible({ timeout: 90000 });
+        if (await this.incidentIcon.isVisible())
+            return 'incident';
+        return 'active';
     }
     async assertEitherIncidentOrCompletedIconVisible() {
-        return Promise.race([
-            this.incidentIcon.waitFor({ timeout: 90000 }).then(() => 'incident'),
-            this.completedIcon.waitFor({ timeout: 90000 }).then(() => 'completed'),
-        ]);
+        const either = this.incidentIcon.or(this.completedIcon);
+        await (0, test_1.expect)(either).toBeVisible({ timeout: 90000 });
+        if (await this.incidentIcon.isVisible())
+            return 'incident';
+        return 'completed';
     }
     async assertProcessCompleteStatusWithRetry(timeout = 60000, maxRetries = 10) {
         for (let attempt = 0; attempt < maxRetries; attempt++) {
@@ -145,7 +147,7 @@ class OperateProcessInstancePage {
                 if (attempt < maxRetries - 1) {
                     console.warn(`Process complete status attempt ${attempt + 1} failed. Retrying...`);
                     await this.page.reload();
-                    await (0, sleep_1.sleep)(5000);
+                    await this.page.waitForLoadState('domcontentloaded');
                 }
                 else {
                     throw new Error(`Assertion failed after ${maxRetries} attempts`);
@@ -164,7 +166,7 @@ class OperateProcessInstancePage {
                 console.log(`assertProcessVariableContainsText attempt ${attempt + 1}/${maxRetries} failed: ${error}`);
                 if (attempt < maxRetries - 1) {
                     await this.page.reload({ timeout: 10000 }).catch(() => { });
-                    await (0, sleep_1.sleep)(2000);
+                    await this.page.waitForLoadState('domcontentloaded').catch(() => { });
                 }
             }
         }
@@ -182,7 +184,7 @@ class OperateProcessInstancePage {
                 console.log(`assertResultVariableVisibleWithRetry attempt ${attempt + 1}/${maxRetries} failed: ${error}`);
                 if (attempt < maxRetries - 1) {
                     await this.page.reload({ timeout: 10000 }).catch(() => { });
-                    await (0, sleep_1.sleep)(2000);
+                    await this.page.waitForLoadState('domcontentloaded').catch(() => { });
                 }
             }
         }

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

@@ -26,15 +26,11 @@ class OptimizeCollectionsPage {
         this.reportAuthor = page.getByRole('cell', { name: 'Demo User' });
     }
     async clickCreateNewButton() {
-        try {
-            await this.modalCloseButton.click({ timeout: 60000 });
-            await this.collectionsLink.click({ timeout: 60000 });
-            await this.createNewButton.click({ timeout: 90000 });
-        }
-        catch (error) {
-            await this.collectionsLink.click({ timeout: 60000 });
-            await this.createNewButton.click({ timeout: 90000 });
+        if (await this.modalCloseButton.isVisible({ timeout: 2000 })) {
+            await this.modalCloseButton.click();
         }
+        await this.collectionsLink.click({ timeout: 60000 });
+        await this.createNewButton.click({ timeout: 90000 });
     }
     async clickReportOption() {
         await this.reportOption.click();

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

@@ -30,22 +30,16 @@ class OptimizeHomePage {
         this.licenseKeyTagProduction = page.getByText('Production license').first();
     }
     async clickCollectionsLink() {
-        try {
+        if (await this.modalCloseButton.isVisible({ timeout: 2000 })) {
             await this.modalCloseButton.click();
-            await this.collectionsLink.click();
-        }
-        catch (error) {
-            await this.collectionsLink.click();
         }
+        await this.collectionsLink.click();
     }
     async clickDashboardLink() {
-        try {
+        if (await this.modalCloseButton.isVisible({ timeout: 2000 })) {
             await this.modalCloseButton.click();
-            await this.dashboardLink.click();
-        }
-        catch (error) {
-            await this.dashboardLink.click();
         }
+        await this.dashboardLink.click();
     }
     async assertProcessHasBeenImported(processId) {
         await this.clickDashboardLink();

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

@@ -75,7 +75,6 @@ async function completeTaskWithRetry(page, taskPanelPage, taskDetailsPage, taskN
             .first();
         if (await toastCloseButton.isVisible({ timeout: 2000 })) {
             await toastCloseButton.click();
-            await (0, sleep_1.sleep)(500);
         }
     }
     catch {
@@ -84,7 +83,6 @@ async function completeTaskWithRetry(page, taskPanelPage, taskDetailsPage, taskN
     for (let attempt = 0; attempt < maxRetries; attempt++) {
         try {
             await page.waitForLoadState('networkidle');
-            await (0, sleep_1.sleep)(500);
             const taskLocator = taskPanelPage.availableTasks
                 .getByText(taskName, { exact: true })
                 .first();
@@ -97,7 +95,6 @@ async function completeTaskWithRetry(page, taskPanelPage, taskDetailsPage, taskN
             // Click the task directly instead of using openTask's 30-retry loop
             // (this outer loop already provides retry logic)
             await taskLocator.click({ timeout: 10000 });
-            await (0, sleep_1.sleep)(1000);
             await (0, test_1.expect)(taskDetailsPage.detailsPanel).toBeVisible({ timeout: 30000 });
             // Verify the correct task is loaded by checking the task name appears
             // in the details-info section (the task name heading is outside the
@@ -109,9 +106,9 @@ async function completeTaskWithRetry(page, taskPanelPage, taskDetailsPage, taskN
             await (0, test_1.expect)(taskDetailsPage.detailsPanel.getByText(taskPriority)).toBeVisible({ timeout: 30000 });
             await taskDetailsPage.completeTaskButton.click({ timeout: 30000 });
             await (0, test_1.expect)(taskDetailsPage.taskCompletedBanner).toBeVisible({
-                timeout: 60000,
+                timeout: 30000,
             });
-            await (0, test_1.expect)(taskPanelPage.availableTasks.getByText(taskName, { exact: true }).first()).not.toBeVisible({ timeout: 60000 });
+            await (0, test_1.expect)(taskPanelPage.availableTasks.getByText(taskName, { exact: true }).first()).not.toBeVisible({ timeout: 15000 });
             console.log(`Successfully completed task: ${taskName}`);
             return;
         }
@@ -126,7 +123,6 @@ async function completeTaskWithRetry(page, taskPanelPage, taskDetailsPage, taskN
                         .first();
                     if (await toastCloseButton.isVisible({ timeout: 1000 })) {
                         await toastCloseButton.click();
-                        await (0, sleep_1.sleep)(300);
                     }
                 }
                 catch {
@@ -134,7 +130,6 @@ async function completeTaskWithRetry(page, taskPanelPage, taskDetailsPage, taskN
                 }
                 await page.reload();
                 await page.waitForLoadState('networkidle');
-                await (0, sleep_1.sleep)(500);
             }
             else {
                 console.error(`All ${maxRetries} attempts failed for task ${taskName}`);
@@ -253,10 +248,11 @@ async function assertLocatorVisibleWithPaginated(page, locator, text) {
     }
 }
 exports.assertLocatorVisibleWithPaginated = assertLocatorVisibleWithPaginated;
-async function assertLocatorVisibleWithRetry(page, locator, text, timeout = 120000, notVisible, maxRetries = 3, clickLocator) {
+async function assertLocatorVisibleWithRetry(page, locator, text, timeout = 30000, notVisible, maxRetries = 3, clickLocator) {
     for (let attempt = 0; attempt < maxRetries; attempt++) {
         try {
             await page.reload();
+            await page.waitForLoadState('domcontentloaded');
             if (clickLocator) {
                 await (0, test_1.expect)(clickLocator).toBeVisible({
                     timeout: 30000,
@@ -264,7 +260,6 @@ async function assertLocatorVisibleWithRetry(page, locator, text, timeout = 1200
                 await clickLocator.click();
             }
             if (notVisible == true) {
-                await (0, sleep_1.sleep)(10000);
                 await (0, test_1.expect)(locator.first()).not.toBeVisible({
                     timeout: timeout,
                 });
@@ -287,12 +282,12 @@ async function assertLocatorVisibleWithRetry(page, locator, text, timeout = 1200
     }
 }
 exports.assertLocatorVisibleWithRetry = assertLocatorVisibleWithRetry;
-async function assertPageTextWithRetry(page, text, notVisible, timeout = 120000, maxRetries = 3) {
+async function assertPageTextWithRetry(page, text, notVisible, timeout = 30000, maxRetries = 3) {
     for (let attempt = 0; attempt < maxRetries; attempt++) {
         try {
             await page.reload();
+            await page.waitForLoadState('domcontentloaded');
             if (notVisible == true) {
-                await (0, sleep_1.sleep)(10000);
                 await (0, test_1.expect)(page.getByText(text, { exact: true }).first()).not.toBeVisible({
                     timeout: timeout,
                 });

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

@@ -1,18 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertReportWithRefreshes = exports.createReportForProcess = void 0;
-const test_1 = require("@playwright/test");
 const UtilitiesPage_1 = require("../SM-8.10/UtilitiesPage");
 const UtilitiesPage_2 = require("../SM-8.10/UtilitiesPage");
 const createReportForProcess = async (optimizeCollectionsPage, optimizeReportPage, processName) => {
-    let retries = 1000; // big number as this can struggle when many processes are running at once
-    while (retries > 0) {
+    const maxRetries = 30;
+    for (let attempt = 0; attempt < maxRetries; attempt++) {
         try {
             await optimizeCollectionsPage.clickCreateNewButton();
             await optimizeCollectionsPage.clickReportOption();
             await optimizeReportPage.clickProcessSelectionButton();
             await optimizeReportPage.waitUntilUserTaskProcessIsVisible(processName);
-            break;
+            return;
         }
         catch (error) {
             try {
@@ -21,28 +20,26 @@ const createReportForProcess = async (optimizeCollectionsPage, optimizeReportPag
             catch (cancelError) {
                 // Page may have been closed due to test timeout, ignore
             }
-            await new Promise((resolve) => setTimeout(resolve, 5000));
+            await new Promise((resolve) => setTimeout(resolve, 2000));
         }
-        retries--;
-        (0, test_1.expect)(retries).toBeGreaterThan(0);
     }
+    throw new Error(`Failed to create report for process ${processName} after ${maxRetries} attempts`);
 };
 exports.createReportForProcess = createReportForProcess;
 const assertReportWithRefreshes = async (page, optimizeHomePage, optimizeCollectionsPage, optimizeReportPage, reportName, locator, text) => {
-    let retries = 1000; // big number as this can struggle when many processes are running at once
-    while (retries > 0) {
+    const maxRetries = 30;
+    for (let attempt = 0; attempt < maxRetries; attempt++) {
         try {
             await optimizeHomePage.clickCollectionsLink();
             await (0, UtilitiesPage_1.assertPageTextWithRetry)(page, reportName, false);
             await optimizeCollectionsPage.clickMostRecentProcessReport(reportName);
             await (0, UtilitiesPage_2.assertLocatorVisibleWithRetry)(page, locator, text, 0);
-            break;
+            return;
         }
         catch (error) {
             // nothing to do. Just loop back to the collections
         }
-        retries--;
-        (0, test_1.expect)(retries).toBeGreaterThan(0);
     }
+    throw new Error(`Failed to assert report ${reportName} after ${maxRetries} attempts`);
 };
 exports.assertReportWithRefreshes = assertReportWithRefreshes;

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

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IdentityTenantPage = void 0;
 const test_1 = require("@playwright/test");
 const sleep_1 = require("../../utils/sleep");
-const UtilitiesPage_1 = require("../SM-8.8/UtilitiesPage");
+const expectLocatorWithPagination_1 = require("../../utils/assertionHelpers/expectLocatorWithPagination");
+const clickLocatorWithRetry_1 = require("../../utils/assertionHelpers/clickLocatorWithRetry");
 class IdentityTenantPage {
     page;
     createTenantMainButton;
@@ -43,7 +44,7 @@ class IdentityTenantPage {
         this.assignUsersButton = page.getByRole('button', { name: 'Assign users' });
         this.searchUsersInput = page.getByPlaceholder('Search users');
         this.assignUserFinalButton = page
-            .getByLabel('Assign users')
+            .getByRole('dialog', { name: 'Assign users' })
             .getByRole('button', { name: 'Assign users' });
         this.removeUserButton = page.getByLabel('Remove user');
         this.removeButton = page.getByRole('button', { name: 'danger Remove' });
@@ -91,8 +92,11 @@ class IdentityTenantPage {
         await this.enterTenantIdInput.fill(tenantId);
     }
     async clickAssignedUsersTab() {
-        await (0, test_1.expect)(this.assignedUsersTab).toBeVisible({ timeout: 60000 });
-        await this.assignedUsersTab.click({ timeout: 60000 });
+        await (0, clickLocatorWithRetry_1.clickLocatorWithRetry)(this.page, this.assignedUsersTab, {
+            postAction: async () => {
+                await this.page.reload();
+            },
+        });
     }
     async clickAssignUsersButton() {
         await (0, test_1.expect)(this.assignUsersButton).toBeVisible({ timeout: 60000 });
@@ -108,13 +112,10 @@ class IdentityTenantPage {
         try {
             await (0, test_1.expect)(this.assignUserFinalButton).toBeVisible({ timeout: 60000 });
             await this.assignUserFinalButton.click();
-            await (0, test_1.expect)(this.page.getByText('Users assigned')).toBeVisible();
+            await (0, test_1.expect)(this.page.getByText('Users assigned', { exact: true })).toBeVisible();
         }
         catch (e) {
-            if (await this.page
-                .getByText('ALREADY_EXISTS')
-                .first()
-                .isVisible({ timeout: 8000 })) {
+            if (await this.page.getByText('ALREADY_EXISTS').first().isVisible()) {
                 console.log('Tenant is already assigned to tenant');
                 await this.cancelButton.click();
                 await (0, test_1.expect)(this.dialog).not.toBeVisible({ timeout: 15000 });
@@ -151,7 +152,7 @@ class IdentityTenantPage {
             try {
                 await this.page.waitForLoadState('domcontentloaded').catch(() => { });
                 const tenantRow = this.row(tenantName);
-                await (0, UtilitiesPage_1.assertLocatorVisibleWithPaginated)(this.page, tenantRow, `Tenant with name ${tenantName} not found`);
+                await (0, expectLocatorWithPagination_1.expectLocatorWithPagination)(this.page, tenantRow);
                 await tenantRow.locator('td').first().click({ timeout: 30000 });
                 await this.usersTab.waitFor({ state: 'visible', timeout: 30000 });
                 return;
@@ -185,7 +186,7 @@ class IdentityTenantPage {
         await this.clickSearchUsersInput();
         await this.fillSearchUsersInput(user);
         await (0, test_1.expect)(this.page.getByText(userEmail)).toBeVisible({ timeout: 30000 });
-        await this.page.getByText(userEmail).click();
+        await this.page.getByText(userEmail).click({ timeout: 30000 });
         await this.clickAssignUserFinalButton();
     }
     async removeUserFromTenant(tenantName) {

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

@@ -29,6 +29,7 @@ class NavigationPage {
         this.optimizePageBanner = page.getByRole('link', {
             name: 'Camunda logo Optimize',
         });
+        // TODO: Drop support for Identity once we fully rename it to Admin
         this.identityPageBanner = page
             .locator('a')
             .filter({ hasText: /^Camunda logo\s*(Identity|Admin)$/ })
@@ -36,31 +37,39 @@ class NavigationPage {
         this.consolePageBanner = page.getByRole('link', {
             name: 'Camunda logo Console',
         });
-        this.managementIdentityPageBanner = page.getByRole('link', {
-            name: 'Camunda logo Management Identity',
-        });
+        this.managementIdentityPageBanner = page
+            .locator('a')
+            .filter({ hasText: /^Camunda logo\s*Management Identity$/ })
+            .first();
         this.keyboardPageBanner = page.locator('#keycloak-bg');
     }
     async goTo(url, banner, sleepTimeout, { username = 'demo', password = process.env.DISTRO_QA_E2E_TESTS_IDENTITY_FIRSTUSER_PASSWORD ??
         'demo', } = {}, maxRetries = 3) {
         const startTime = Date.now();
-        let timeout = constants_1._1_SECOND_IN_MS * 1;
+        let timeout = constants_1._1_SECOND_IN_MS * 10;
         if (url === '/modeler') {
-            timeout = constants_1._1_SECOND_IN_MS * 10;
+            timeout = constants_1._1_SECOND_IN_MS * 20;
         }
         for (let attempt = 0; attempt < maxRetries; attempt++) {
             try {
                 if (sleepTimeout) {
                     await (0, sleep_1.sleep)(sleepTimeout);
                 }
-                await this.page.goto(url, { timeout: 10000 });
+                await this.page.goto(url, {
+                    timeout: 30000,
+                    waitUntil: 'domcontentloaded',
+                });
                 const loginPage = new LoginPage_1.LoginPage(this.page);
-                const loginSelector = loginPage.usernameInput;
-                await (0, test_1.expect)(banner.or(loginSelector)).toBeVisible();
-                const isBannerVisible = await banner.isVisible();
+                const loginEntryPoint = banner
+                    .or(loginPage.usernameInput)
+                    .or(loginPage.coreUsernameInput)
+                    .or(loginPage.keycloakBanner)
+                    .first();
+                await (0, test_1.expect)(loginEntryPoint).toBeVisible({ timeout: 30000 });
+                const isBannerVisible = await banner.isVisible().catch(() => false);
                 if (isBannerVisible) {
                     try {
-                        await (0, test_1.expect)(loginSelector).toBeVisible({ timeout: 5000 });
+                        await (0, test_1.expect)(loginPage.usernameInput).toBeVisible({ timeout: 5000 });
                         await loginPage.login(username, password);
                     }
                     catch (error) {
@@ -71,6 +80,7 @@ class NavigationPage {
                 else {
                     await loginPage.login(username, password);
                 }
+                await (0, test_1.expect)(banner).toBeVisible({ timeout: 60000 });
                 return;
             }
             catch (error) {

package/dist/pages/SM-8.8/OCIdentityRolesPage.js

@@ -160,7 +160,8 @@ class OCIdentityRolesPage {
         await this.clickAssignUserSubButton();
     }
     async clickAssignUserButton() {
-        await this.assignUserButton.click();
+        await (0, test_1.expect)(this.assignUserButton).toBeVisible({ timeout: 60000 });
+        await this.assignUserButton.click({ timeout: 60000 });
     }
     async clickUsernameTextbox() {
         await this.usernameTextBox.click();
@@ -172,6 +173,7 @@ class OCIdentityRolesPage {
         await this.assignUserSubButton.click();
     }
     async clickAdminRole() {
+        await (0, test_1.expect)(this.adminRole).toBeVisible({ timeout: 60000 });
         await this.adminRole.click();
     }
     async clickClientsTab() {

package/dist/pages/SM-8.8/OCTenantPage.d.ts

@@ -24,6 +24,7 @@ declare class OCTenantPage {
     readonly roleIdSearchBox: Locator;
     readonly assignRoleSubButton: Locator;
     readonly cancelButton: Locator;
+    readonly gotItButton: Locator;
     readonly row: (name: string) => Locator;
     constructor(page: Page);
     clickCreateTenantMainButton(): Promise<void>;
@@ -44,6 +45,7 @@ declare class OCTenantPage {
     createTenant(tenantName: string): Promise<void>;
     assertTenantCreated(): Promise<void>;
     clickCancelButton(): Promise<void>;
+    clickGotItButton(): Promise<void>;
     clickTenant(tenantName: string): Promise<void>;
     assignUserToTenant(user: string): Promise<void>;
     removeUserFromTenant(tenantName: string): Promise<void>;

package/dist/pages/SM-8.8/OCTenantPage.js

@@ -29,6 +29,7 @@ class OCTenantPage {
     roleIdSearchBox;
     assignRoleSubButton;
     cancelButton;
+    gotItButton;
     row;
     constructor(page) {
         this.page = page;
@@ -77,6 +78,7 @@ class OCTenantPage {
         this.cancelButton = page
             .getByRole('dialog')
             .getByRole('button', { name: 'Cancel' });
+        this.gotItButton = page.getByRole('button', { name: 'Got it' });
         this.row = (name) => this.page.getByRole('row').filter({ hasText: name }).first();
     }
     async clickCreateTenantMainButton() {
@@ -115,10 +117,7 @@ class OCTenantPage {
             await (0, test_1.expect)(this.page.getByRole('dialog')).not.toBeVisible();
         }
         catch (e) {
-            if (await this.page
-                .getByText('ALREADY_EXISTS')
-                .first()
-                .isVisible({ timeout: 10000 })) {
+            if (await this.page.getByText('ALREADY_EXISTS').first().isVisible()) {
                 console.log('User is already assigned to tenant');
                 await this.clickCancelButton();
             }
@@ -152,25 +151,32 @@ class OCTenantPage {
     }
     async assertTenantCreated() {
         try {
-            await (0, test_1.expect)(this.page.getByText('Tenant created')).toBeVisible({
+            await (0, test_1.expect)(this.page.getByText('successfully created')).toBeVisible({
                 timeout: 8000,
             });
+            // "Got it" button appears in some versions but not others
+            try {
+                await this.clickGotItButton();
+            }
+            catch {
+                // Button not present in this version, continue
+            }
         }
         catch (error) {
-            if (await this.page
-                .getByText('ALREADY_EXISTS')
-                .first()
-                .isVisible({ timeout: 8000 })) {
+            if (await this.page.getByText('ALREADY_EXISTS').first().isVisible()) {
                 await this.clickCancelButton();
             }
             else {
-                throw new Error('Assigning user to tenant failed' + error);
+                throw new Error('Creating tenant failed' + error);
             }
         }
     }
     async clickCancelButton() {
         await this.cancelButton.click({ timeout: 30000 });
     }
+    async clickGotItButton() {
+        await this.gotItButton.click({ timeout: 30000 });
+    }
     async clickTenant(tenantName) {
         const maxRetries = 10;
         for (let attempt = 1; attempt <= maxRetries; attempt++) {

package/dist/tests/SM-8.8/mt-enabled-user-flows.spec.js

@@ -6,6 +6,7 @@ const _setup_1 = require("../../test-setup.js");
 const UtilitiesPage_1 = require("../../pages/SM-8.8/UtilitiesPage");
 const resetSession_1 = require("../../utils/resetSession");
 const expectTextWithRetry_1 = require("../../utils/assertionHelpers/expectTextWithRetry");
+const expectLocatorWithRetry_1 = require("../../utils/assertionHelpers/expectLocatorWithRetry");
 const demoUserEmail = process.env.DEMO_USER_EMAIL || 'demo@example.org';
 const demoUserDisplayText = `Demo User${demoUserEmail}`;
 if (process.env.IS_MT === 'true') {
@@ -49,7 +50,7 @@ if (process.env.IS_MT === 'true') {
             });
             await SM_8_8_1.test.step('Open Cross Component Test Project', async () => {
                 await navigationPage.goToModeler();
-                await modelerHomePage.clickCrossComponentProjectFolder();
+                await modelerHomePage.createCrossComponentProjectFolder();
                 await modelerHomePage.clickDiagramTypeDropdown();
                 await modelerHomePage.clickBpmnTemplateOption();
             });
@@ -490,7 +491,7 @@ if (process.env.IS_MT === 'true') {
             });
             await SM_8_8_1.test.step('Open Cross Component Test Project', async () => {
                 await navigationPage.goToModeler();
-                await modelerHomePage.clickCrossComponentProjectFolder();
+                await modelerHomePage.createCrossComponentProjectFolder();
                 await modelerHomePage.clickDiagramTypeDropdown();
                 await modelerHomePage.clickBpmnTemplateOption();
             });
@@ -531,6 +532,11 @@ if (process.env.IS_MT === 'true') {
             }
             await SM_8_8_1.test.step('Delete Tenant Access For Demo User OC', async () => {
                 await navigationPage.goToOCIdentity();
+                await (0, expectLocatorWithRetry_1.expectLocatorWithRetry)(page, ocIdentityHomePage.tenantsTab, {
+                    postAction: async () => {
+                        await navigationPage.goToOCIdentity();
+                    },
+                });
                 await ocIdentityHomePage.clickTenantsTab();
                 await ocTenantPage.removeUserFromTenant(tenantName);
             });

package/dist/utils/assertionHelpers/expectLocatorWithRetry.js

@@ -12,13 +12,10 @@ const expectLocatorWithRetry = async (page, item, options) => {
                 await options?.preAction();
             }
             await page.waitForLoadState('domcontentloaded');
-            await Promise.race([
-                item.waitFor({
-                    state: shouldBeVisible ? 'visible' : 'hidden',
-                    timeout: visibilityTimeout,
-                }),
-                new Promise((_, reject) => setTimeout(() => reject(new Error('Visibility timeout')), visibilityTimeout)),
-            ]);
+            await item.waitFor({
+                state: shouldBeVisible ? 'visible' : 'hidden',
+                timeout: visibilityTimeout,
+            });
             return;
         }
         catch (err) {

package/dist/utils/resetSession.js

@@ -4,11 +4,8 @@ exports.resetSessionAll = exports.resetSession = void 0;
 async function resetSession(browser, page) {
     const context = browser.contexts()[0];
     await context.clearCookies();
-    await page.evaluate(() => {
-        localStorage.clear();
-        sessionStorage.clear();
-    });
     await page.reload();
+    await page.waitForLoadState('domcontentloaded');
     await page.goto('/');
 }
 exports.resetSession = resetSession;

package/package.json

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