@camunda/e2e-test-suite 0.0.478 → 0.0.479

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/package.json

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