@camunda/e2e-test-suite 0.0.1273 → 0.0.1274

package/dist/pages/8.8/ModelerHomePage.js

@@ -7,8 +7,16 @@ const clickLocatorWithRetry_1 = require("../../utils/assertionHelpers/clickLocat
 const sessionRecovery_1 = require("../../utils/sessionRecovery");
 const randomName_1 = require("../../utils/randomName");
 const ProcessApplicationPage_1 = require("./ProcessApplicationPage");
+const submitModalWithRetry_1 = require("../../utils/assertionHelpers/submitModalWithRetry");
+const consoleApiHelpers_1 = require("../../utils/consoleApiHelpers");
+const hubResourceRename_1 = require("../../utils/hubResourceRename");
 class ModelerHomePage {
     defaultFolderName = 'Cross Component Test Project';
+    // The default cluster test-setup.spec.ts's "Create Default Cluster" test
+    // provisions for the whole suite -- assigned to the shared workspace's
+    // Environments step so downstream specs can deploy to it without a manual
+    // assignment step first.
+    defaultClusterName = 'Test Cluster';
     page;
     // Since camunda/camunda-hub#25831 files and folders cannot sit at a
     // workspace ("project" in today's UI) root -- only process applications and
@@ -25,6 +33,11 @@ class ModelerHomePage {
     processApplicationName;
     modelerPageBanner;
     createNewProjectButton;
+    createWorkspaceButton;
+    workspaceWizardNameInput;
+    workspaceWizardSubmitButton;
+    workspaceWizardMembersStep;
+    workspaceWizardEnvironmentsHeading;
     projectNameInput;
     formNameInput;
     chooseBpmnTemplateButton;
@@ -58,9 +71,24 @@ class ModelerHomePage {
     constructor(page) {
         this.page = page;
         this.processApplicationPage = new ProcessApplicationPage_1.ProcessApplicationPage(page);
-        this.modelerPageBanner = page.getByRole('banner', {
+        // Hub's design-system shell renders the app header as a role=banner with no
+        // accessible name after the Camunda Hub rebrand, so the classic
+        // name-matched banner no longer resolves; the Modeler logo link inside it
+        // carries "Camunda Hub home" when the org has workspacesEnabled, else
+        // "Camunda Modeler home" (camunda-hub NavShellDs.common.tsx) -- match
+        // either. Keep the legacy named-banner branch for shells where the rename
+        // has not shipped yet.
+        this.modelerPageBanner = page
+            .getByRole('banner', {
             name: 'Camunda Modeler',
-        });
+        })
+            .or(page
+            .getByRole('link', { name: 'Camunda Hub home' })
+            .and(page.locator(':not([href$="/login"])')))
+            .or(page
+            .getByRole('link', { name: 'Camunda Modeler home' })
+            .and(page.locator(':not([href$="/login"])')))
+            .first();
         // Hub renamed this button to "Create project" on both the classic and the
         // design-system shell. The legacy label is kept so the flow still works
         // against Modeler builds where the rename has not shipped yet. exact:true
@@ -73,8 +101,32 @@ class ModelerHomePage {
             name: 'Create project',
             exact: true,
         }));
+        // Camunda Hub, which replaced Console + Web Modeler on SaaS, tops the
+        // hierarchy with a Workspaces overview whose "Create workspace" CTA opens a
+        // two-step wizard (General -> Members) that names the workspace up front.
+        // Same hooks as pages/8.9/ModelerHomePage.ts. exact:true keeps the
+        // split button's options chevron out of the match.
+        this.createWorkspaceButton = page.getByRole('button', {
+            name: 'Create workspace',
+            exact: true,
+        });
+        this.workspaceWizardNameInput = page.locator('#workspace-name');
+        this.workspaceWizardSubmitButton = page.locator('[data-test="workspace-wizard-submit"]');
+        this.workspaceWizardMembersStep = page.locator('[data-test="step-members"]');
+        // When the org has environments enabled, an "Assign environments" step is
+        // inserted after Members -- camunda-hub's own
+        // e2e-playwright/pages/CreateWorkspacePage.ts detects it the same way.
+        this.workspaceWizardEnvironmentsHeading = page.getByRole('heading', {
+            name: 'Assign environments',
+        });
         this.projectNameInput = page.locator('[data-test="editable-input"]');
-        this.formNameInput = page.locator('[data-test="editable-input"]');
+        // Hub's rename flow moved into a dialog whose field is
+        // `[data-test="rename-input"]` (#rename-input); the legacy shells still
+        // rename through the inline editable title. Match either.
+        this.formNameInput = page
+            .locator('[data-test="rename-input"]')
+            .or(page.locator('[data-test="editable-input"]'))
+            .first();
         this.idpApplicationNameInput = page.getByPlaceholder('New IDP Application');
         this.createIdpApplicationButton = page.getByRole('button', {
             name: 'Create',
@@ -90,27 +142,60 @@ class ModelerHomePage {
         this.idpEmptyStateButton = page.getByRole('button', {
             name: 'Create IDP application',
         });
-        this.diagramTypeDropdown = page.locator('[data-test="diagram-dropdown"]');
+        // Camunda Hub's design-system shell renders this trigger as
+        // `create-action-dropdown` (CreateActionDs.tsx, accessible name "Create
+        // new"); `diagram-dropdown` is the legacy shell's id and survives only in
+        // hub's own older cypress specs. Match either so both shells work.
+        this.diagramTypeDropdown = page
+            .locator('[data-test="create-action-dropdown"]')
+            .or(page.locator('[data-test="diagram-dropdown"]'))
+            .first();
         // Matched on the test id alone: hub's design-system variant of the create
         // menu renders "BPMN diagram" (lowercase d), so a text filter breaks the
         // day that variant ships.
         this.bpmnTemplateOption = page.locator('[data-test="create-bpmn-diagram"]');
         this.formTemplateOption = page.locator('[data-test="create-form"]');
         this.diagramPropertiesPanel = page.locator('[data-group-id="group-general"]');
-        this.projectBreadcrumb = page.locator('[data-test="breadcrumb-project"]');
+        // Hub's breadcrumbs carry no data-test at all (confirmed by a DOM audit of
+        // a live run: none of the seven breadcrumb-* ids this file used are
+        // present). Its trail is a `navigation` landmark whose entries are links,
+        // so address the project by its own name there and keep the legacy id for
+        // shells that still emit it.
+        this.projectBreadcrumb = page
+            .locator('[data-test="breadcrumb-project"]')
+            .or((0, hubResourceRename_1.hubBreadcrumbs)(page).getByRole('link', {
+            name: this.defaultFolderName,
+            exact: true,
+        }))
+            .first();
         // Kept separate from projectBreadcrumb, which now means "the container my
         // resources live in". When hub's workspaces terminology flag flips,
         // breadcrumb-project comes to denote the process application, so the
         // workspace level needs its own name from the start.
+        // Neither breadcrumb-project nor breadcrumb-workspace exists on Hub (the
+        // DOM audit found none of the breadcrumb-* ids), so this click waited out
+        // its whole 60s. Hub's trail reads "<org> / <workspace> / <project>", and
+        // the workspace and its project share this name -- take the LAST entry, the
+        // project, since that is the container callers come back here to add
+        // resources to.
         this.workspaceBreadcrumb = page
             .locator('[data-test="breadcrumb-project"]')
             .or(page.locator('[data-test="breadcrumb-workspace"]'))
+            .or((0, hubResourceRename_1.hubBreadcrumbs)(page)
+            .getByRole('link', { name: this.defaultFolderName, exact: true })
+            .last())
+            .or((0, hubResourceRename_1.hubBreadcrumbs)(page)
+            .getByRole('button', { name: this.defaultFolderName, exact: true })
+            .last())
             .first();
         this.homeBreadcrumb = page.locator('[data-test="breadcrumb-home"]');
         this.openOrganizationsButton = page.getByLabel('Open Organizations');
         this.manageButton = page.getByRole('menuitem', { name: 'Manage' });
+        // On the Camunda Hub Workspaces overview the folder is a workspace tile
+        // whose "Open workspace <name>" button navigates into it.
         this.crossComponentProjectFolder = page
-            .getByTitle(this.defaultFolderName, { exact: true })
+            .getByRole('button', { name: `Open workspace ${this.defaultFolderName}` })
+            .or(page.getByTitle(this.defaultFolderName, { exact: true }))
             .first();
         this.rows = page.getByRole('row');
         this.uploadFilesButton = page.getByRole('menuitem', { name: 'Upload files' });
@@ -347,6 +432,24 @@ class ModelerHomePage {
         }
     }
     async enterNewProjectName(name) {
+        // Camunda Hub names a project up front in a creation dialog
+        // (`#create-project-name`) instead of the legacy inline rename on a
+        // project that already exists. When that dialog is what "Create project"
+        // opened, the inline editor below never mounts, so name it here and
+        // return -- the caller only needs the project to exist and be named.
+        const createProjectNameInput = this.page.locator('#create-project-name');
+        if (await this.becameVisible(createProjectNameInput, 10000)) {
+            const dialog = this.page.getByRole('dialog').filter({
+                has: createProjectNameInput,
+            });
+            await createProjectNameInput.fill(name);
+            await (0, test_1.expect)(createProjectNameInput).toHaveValue(name, { timeout: 10000 });
+            await (0, submitModalWithRetry_1.submitModalWithRetry)(dialog
+                .getByRole('button', { name: 'Create project', exact: true })
+                .or(dialog.getByRole('button', { name: 'Create', exact: true }))
+                .first(), dialog);
+            return;
+        }
         // The inline rename silently drops the value when the editable title field
         // is not yet in edit mode as fill() runs, leaving the project named
         // "New project". Re-enter until the field reflects the requested name.
@@ -442,7 +545,34 @@ class ModelerHomePage {
     // workspace root no longer offers BPMN, Form or Upload -- those resources
     // cannot live there -- so the container is entered first. Callers are
     // unchanged, which is why the existing spec call sites need no edit.
+    // Camunda Hub lets blank resources live directly in a project: the project's
+    // own "Create new" menu (ProjectActionButtonDs, data-test="diagram-dropdown")
+    // renders BPMN diagram / DMN diagram / Form / RPA script / Element template /
+    // README / Folder whenever the current container is not the project ROOT, and
+    // offers "Process application" only at that root. Opening it and looking for
+    // the resource items is the only way to tell the two menus apart, since both
+    // share the trigger.
+    //
+    // Returns true with the menu left OPEN for the caller's option click.
+    async openProjectCreateMenuWithResources() {
+        if (!(await this.becameVisible(this.diagramTypeDropdown, 15000))) {
+            return false;
+        }
+        await this.dismissOverlays();
+        await this.diagramTypeDropdown.click({ timeout: 30000 });
+        if (await this.becameVisible(this.formTemplateOption.or(this.bpmnTemplateOption).first(), 10000)) {
+            return true;
+        }
+        // The root menu instead: close it so the process-application path below
+        // starts from a page with no open dropdown holding the pointer-events lock
+        // Radix puts on <body> while a menu is open.
+        await this.page.keyboard.press('Escape').catch(() => { });
+        return false;
+    }
     async clickDiagramTypeDropdown() {
+        if (await this.openProjectCreateMenuWithResources()) {
+            return;
+        }
         await this.enterResourceContainer();
         const dropdown = this.processApplicationPage.createNewDropdown;
         for (let attempt = 0; attempt < 4; attempt++) {
@@ -539,10 +669,8 @@ class ModelerHomePage {
     }
     async enterFormName(name) {
         await (0, sessionRecovery_1.recoverStuckModelerLogin)(this.page);
-        await (0, test_1.expect)(this.formNameInput).toBeVisible({ timeout: 120000 });
-        await this.formNameInput.click({ timeout: 60000, force: true });
-        await this.formNameInput.fill(name, { timeout: 60000 });
-        await this.formNameInput.press('Enter');
+        // "New form" is the server default the form still carries at this point.
+        await (0, hubResourceRename_1.renameHubResource)(this.page, 'New form', name);
     }
     // Kept under its original name because it is what the existing call sites
     // already mean: "go back to where my resources live". That is now the
@@ -642,13 +770,110 @@ class ModelerHomePage {
     }
     // Boolean visibility probe. waitFor rather than isVisible, which resolves
     // immediately and would report a false negative on a still-rendering page.
+    // Since camunda-hub #28956 the Workspaces overview defaults org-elevated
+    // users to "My workspaces" -- only workspaces they are an explicit member
+    // of -- and resets to it on every load. The shared folder is created by
+    // whichever test user wins the race, so every other user sees "No
+    // workspaces match this filter" and never finds it. Widen the scope to
+    // "All workspaces" first. The control is absent outside Hub and for
+    // non-elevated users (their list is membership-scoped anyway), so a missing
+    // control is a no-op. Ported from pages/8.10/ModelerHomePage.ts (#3710).
+    async showAllWorkspaces(probeTimeout) {
+        const scopeFilter = this.page.getByRole('combobox', {
+            name: 'Filter workspaces',
+        });
+        if (!(await this.becameVisible(scopeFilter, probeTimeout)))
+            return;
+        if ((await scopeFilter.innerText()).includes('All workspaces'))
+            return;
+        await scopeFilter.click({ timeout: 10000 });
+        await this.page
+            .getByRole('option', { name: 'All workspaces' })
+            .click({ timeout: 10000 });
+        await (0, test_1.expect)(scopeFilter).toContainText('All workspaces', {
+            timeout: 10000,
+        });
+    }
     async becameVisible(locator, timeout) {
         return locator
             .waitFor({ state: 'visible', timeout })
             .then(() => true)
             .catch(() => false);
     }
+    // Drives Camunda Hub's workspace-creation wizard. The name is entered on
+    // the General step, which enables "Next"; the same submit button then
+    // relabels itself through the remaining steps and finally reads "Create
+    // workspace" once it creates the workspace and routes the creator into its
+    // projects listing. Gate the Members-step click on that step becoming
+    // active so the shared submit button is not clicked twice while still on
+    // General.
+    async createWorkspaceViaWizard(name) {
+        await this.dismissOverlays();
+        await this.createWorkspaceButton.click({ timeout: 60000 });
+        await this.workspaceWizardNameInput.fill(name, { timeout: 60000 });
+        await this.workspaceWizardSubmitButton.click({ timeout: 60000 });
+        await (0, test_1.expect)(this.workspaceWizardMembersStep).toHaveAttribute('data-state', 'active', { timeout: 30000 });
+        await this.workspaceWizardSubmitButton.click({ timeout: 60000 });
+        // When the org has environments enabled, this only advances the wizard
+        // into an "Assign environments" step instead of submitting. Assign the
+        // suite's default cluster here rather than submitting with an empty
+        // selection -- otherwise this shared workspace starts with no
+        // environments and every downstream spec that deploys to it needs its
+        // own manual assignment first. Each card's accessible name is
+        // "Select <cluster name>" before it is picked (camunda-hub's own
+        // create-workspace-environments.spec.tsx asserts the same pattern).
+        // Sampled immediately (isVisible() doesn't wait) since the step change
+        // is a synchronous client-side re-render.
+        // Waited for, not sampled: the step transition is not always synchronous,
+        // and an immediate isVisible() read false would skip the cluster
+        // assignment and then wait out the projects-URL check while the wizard is
+        // still open. Matches the 8.10 flow.
+        if (await this.becameVisible(this.workspaceWizardEnvironmentsHeading, 5000)) {
+            // "Create Default Cluster" runs in parallel with this flow
+            // (test-setup.spec.ts's mode: 'parallel'), so the cluster this picker
+            // lists may still be provisioning -- wait for it a generous 90s rather
+            // than sampling once. Fail loudly rather than silently creating the
+            // shared workspace without its default environment, which would turn a
+            // setup problem here into confusing failures in unrelated specs later.
+            const clusterOption = this.page.getByRole('button', {
+                name: new RegExp(`^Select ${this.defaultClusterName}`),
+            });
+            if (await this.becameVisible(clusterOption, 90000)) {
+                await clusterOption.click({ timeout: 10000 });
+            }
+            else {
+                throw new Error(`"${this.defaultClusterName}" was not selectable on the Environments step within 90s -- refusing to create the shared workspace without its default environment assigned, since every downstream spec that deploys to it depends on that assignment.`);
+            }
+            await this.workspaceWizardSubmitButton.click({ timeout: 60000 });
+        }
+        await this.page.waitForURL(/\/workspaces?\/[^/]+\/projects/, {
+            timeout: 120000,
+        });
+    }
     async clickHomeBreadcrumb() {
+        // Camunda Hub has no Modeler home breadcrumb: its home is the Workspaces
+        // overview, reached through the header logo link so the SPA keeps its
+        // in-memory session (a full navigation re-runs the whole Auth0 hand-off).
+        // The link's accessible name is "Camunda Hub home" when the org has
+        // workspacesEnabled, else "Camunda Modeler home" (camunda-hub
+        // NavShellDs.common.tsx) -- match either.
+        if (new URL(this.page.url()).hostname.startsWith('hub.')) {
+            // The href stays literally "/login" until the client's auth state
+            // catches up just after login, so clicking it in that window logs the
+            // session out instead of navigating home. Exclude that href and wait
+            // for the authenticated one, as AppsPage and the 8.9/8.10 flows do.
+            const header = this.page.locator('header[data-slot="app-header"]');
+            const notLogin = this.page.locator(':not([href$="/login"])');
+            await header
+                .getByRole('link', { name: 'Camunda Hub home' })
+                .and(notLogin)
+                .or(header
+                .getByRole('link', { name: 'Camunda Modeler home' })
+                .and(notLogin))
+                .first()
+                .click({ timeout: 30000 });
+            return;
+        }
         // The Console shell's HelpCenter panel ("Your recommendations") renders on
         // top of Web Modeler as a modal dialog that covers the whole page, so the
         // breadcrumb click retries against an element whose pointer events the
@@ -723,6 +948,13 @@ class ModelerHomePage {
     async clickCrossComponentProjectFolder() {
         try {
             await this.clickCrossComponentProjectFolderWithRetry();
+            // Opening the workspace lands on its projects LIST, which renders no
+            // resource-creation control. Callers go straight on to createForm() /
+            // clickCreateProcessApplication(), whose controls only exist inside an
+            // open project, so the hop belongs here rather than in
+            // createCrossComponentProjectFolder() -- smoke-tests and the rba specs
+            // reach the workspace through this method and never through that one.
+            await this.enterProjectInsideWorkspace();
         }
         catch (error) {
             if (this.consecutiveSessionRecoveries > 0) {
@@ -767,6 +999,13 @@ class ModelerHomePage {
                 // it at all: the migration notice ignores Escape.
                 await this.dismissBlockingDialog();
                 await this.clickMessageBanner();
+                // postAction's reload resets Hub's scope filter to "My workspaces".
+                // Let a failed scope switch propagate like dismissBlockingDialog()
+                // and clickMessageBanner() above -- clickLocatorWithRetry's own
+                // preAction handling already logs and retries it; swallowing it here
+                // would otherwise leave the tile wait running against the wrong
+                // ("My workspaces") scope for its full visibilityTimeout.
+                await this.showAllWorkspaces(5000);
             },
             postAction: async () => {
                 // Before anything else: a 5xx from Modeler's own /api/internal/login
@@ -785,9 +1024,22 @@ class ModelerHomePage {
                 // and every remaining attempt just waits out its 60s visibility
                 // timeout before the helper throws. Step back out to home first.
                 const tileVisible = await this.becameVisible(this.crossComponentProjectFolder, 2000);
-                if (!tileVisible &&
-                    (await this.becameVisible(this.homeBreadcrumb, 5000))) {
-                    await this.homeBreadcrumb.click({ timeout: 15000 });
+                if (!tileVisible) {
+                    // Hub renders no `[data-test="breadcrumb-home"]` at all, so probing
+                    // that locator was a guaranteed miss there and the reload below just
+                    // reloaded whatever page we were stuck on. That matters because
+                    // recoverStuckModelerLogin returns to the login route's returnUrl,
+                    // which is the workspace's own /projects page -- INSIDE the
+                    // workspace, where this tile does not exist by construction. Every
+                    // retry then burned its full 60s visibility timeout against a page
+                    // that could never show the tile. Go home the way Hub allows (the
+                    // header logo link) instead.
+                    if (new URL(this.page.url()).hostname.startsWith('hub.')) {
+                        await this.clickHomeBreadcrumb();
+                    }
+                    else if (await this.becameVisible(this.homeBreadcrumb, 5000)) {
+                        await this.homeBreadcrumb.click({ timeout: 15000 });
+                    }
                 }
                 await this.page.reload();
                 await this.page.waitForLoadState('domcontentloaded');
@@ -796,11 +1048,84 @@ class ModelerHomePage {
     }
     async createCrossComponentProjectFolder() {
         await this.dismissOverlays();
-        if (await this.crossComponentProjectFolder.isVisible({ timeout: 10000 })) {
+        // Before the probe below, not after: under "My workspaces" the shared
+        // folder is invisible to every user who did not create it, so probing
+        // first would send them all down the create path and race duplicate
+        // workspaces of the same name.
+        await this.showAllWorkspaces(10000);
+        // becameVisible, not isVisible: the timeout argument does not make
+        // isVisible() wait, so a slow workspace list read as "missing" and this
+        // parallel flow created another fixed-name workspace -- durable
+        // duplicates that every later run then has to disambiguate.
+        if (await this.becameVisible(this.crossComponentProjectFolder, 10000)) {
             console.log('Cross Component Project folder already exists. Clicking into it');
             await this.clickCrossComponentProjectFolder();
             return;
         }
+        if (await this.becameVisible(this.createWorkspaceButton, 5000)) {
+            await this.createWorkspaceViaWizard(this.defaultFolderName);
+            await this.enterProjectInsideWorkspace();
+            return;
+        }
+        await this.clickCreateNewProjectButton();
+        await this.enterNewProjectName(this.defaultFolderName);
+    }
+    // Camunda Hub nests Workspace > Project > resources, and opening a workspace
+    // (or finishing its creation wizard) lands on /workspaces/<id>/projects --
+    // the projects LIST, where no resource-creation control exists. Callers go
+    // straight on to clickDiagramTypeDropdown()/clickCreateProcessApplication(),
+    // whose controls only exist inside an open project, so the hop has to happen
+    // here.
+    //
+    // Keyed on the "New project" / "Create project" button, which hub renders
+    // only on the projects list and never inside an open project, so it answers
+    // which view we are on directly -- the project tile is the wrong signal,
+    // since on a slow list render it is still absent, which would read as
+    // "already inside" and skip a hop that was needed. Same shape as
+    // pages/8.10/ModelerHomePage.ts.
+    async enterProjectInsideWorkspace() {
+        if (!(await this.becameVisible(this.createNewProjectButton, 15000))) {
+            return;
+        }
+        // Scoped to a table row, NOT reusing crossComponentProjectFolder: that
+        // locator matches workspace-level shapes only (an "Open workspace <name>"
+        // button, or a `title` attribute), and the projects list renders neither --
+        // it is a data table whose name cell holds a plain link. Reusing it made
+        // detection fail on every run, so the create branch below ran every time
+        // and the workspace accumulated duplicate same-named projects.
+        //
+        // The row scope also keeps the breadcrumb out of the match: it renders the
+        // workspace's own name, identical to the project's, and clicking it would
+        // navigate back out to the workspace instead of into the project.
+        const projectEntryRow = this.page
+            .getByRole('row')
+            .filter({ hasText: this.defaultFolderName })
+            .first();
+        // The name cell holds no link and no ordinary button: its only button is
+        // `data-slot="data-table-row-primary-action"`, an absolutely-positioned
+        // overlay carrying `pointer-events-none`, so every clickable-element
+        // locator came up empty here and the create branch below ran on every
+        // run, accumulating duplicate same-named projects.
+        //
+        // The row's kebab exposes the project's own id as `data-project-id`, so
+        // read it and navigate straight there -- deterministic, and it sidesteps
+        // both the dead overlay and the ambiguity of several identically named
+        // rows. Fall back to clicking the row itself (it is `cursor-pointer` and
+        // handles the row activation) when the id is not exposed.
+        const rowMenuTrigger = projectEntryRow.locator('[data-test="project-row-menu-trigger"]');
+        if (await this.becameVisible(rowMenuTrigger, 10000)) {
+            const projectId = await rowMenuTrigger.getAttribute('data-project-id');
+            const workspaceId = new URL(this.page.url()).pathname.match(/\/workspaces\/([^/]+)/)?.[1];
+            if (workspaceId) {
+                (0, consoleApiHelpers_1.rememberHubWorkspaceId)(this.page, workspaceId);
+            }
+            if (projectId && workspaceId) {
+                await this.page.goto(new URL(`/workspaces/${workspaceId}/projects/${projectId}`, this.page.url()).toString());
+                return;
+            }
+            await projectEntryRow.click({ timeout: 30000 });
+            return;
+        }
         await this.clickCreateNewProjectButton();
         await this.enterNewProjectName(this.defaultFolderName);
     }

package/dist/pages/8.8/UtilitiesPage.js

@@ -9,6 +9,7 @@ const sleep_1 = require("../../utils/sleep");
 const randomSleep_1 = require("../../utils/randomSleep");
 const SettingsPage_1 = require("./SettingsPage");
 const fileUpload_1 = require("../../utils/fileUpload");
+const consoleApiHelpers_1 = require("../../utils/consoleApiHelpers");
 async function forceLogoutIfNeeded(page) {
     const settingsPage = new SettingsPage_1.SettingsPage(page);
     const loginMessage = page.getByText('Log in to continue to Camunda.');
@@ -37,7 +38,29 @@ exports.forceLogoutIfNeeded = forceLogoutIfNeeded;
 // pre-flight stagger below, so a worker only pays it once per process
 // lifetime rather than on every call -- see the comment at the call site.
 const staggeredWorkerTimeouts = new Set();
+const onboardingTourSuppressed = new WeakSet();
+// Mirrors camunda-hub@452978f: pre-seed the onboarding tour's "seen" localStorage flag
+// (SEEN_KEY_PREFIX in .../tour-dialog/use-onboarding-seen.ts) so it never auto-opens. The
+// "Welcome to Camunda Hub" tour mounts app-wide -- Console included, not just Modeler -- and
+// hides the post-login banner link from the accessibility tree until dismissed, which times
+// out assertTestUsesCorrectOrganization's banner check. addInitScript runs before any page
+// script on every navigation/reload, so there's no login-response race to lose; the flag is
+// matched by prefix since the user id isn't known ahead of login.
+async function suppressOnboardingTour(page) {
+    if (onboardingTourSuppressed.has(page)) {
+        return;
+    }
+    onboardingTourSuppressed.add(page);
+    await page.addInitScript((prefixPattern) => {
+        const pattern = new RegExp(prefixPattern);
+        const originalGetItem = Storage.prototype.getItem;
+        Storage.prototype.getItem = function (key) {
+            return pattern.test(key) ? 'true' : originalGetItem.call(this, key);
+        };
+    }, '^hub\\.onboarding\\..*\\.seen\\.');
+}
 async function loginWithRetry(page, loginPage, testUser, timeout, maxRetries = 5) {
+    await suppressOnboardingTour(page);
     let lastError;
     // Stagger the first navigation across parallel workers. Without this, every
     // worker's initial page.goto('/') fires within the same second -- with 18+
@@ -56,6 +79,11 @@ async function loginWithRetry(page, loginPage, testUser, timeout, maxRetries = 5
     for (let attempt = 0; attempt < maxRetries; attempt++) {
         try {
             await page.context().clearCookies();
+            // The Hub bearer-token cache in consoleApiHelpers.ts is keyed by Page
+            // for the tab's whole lifetime; without clearing it here alongside
+            // cookies/storage, a flow that logs a different user into the same
+            // page could have getUserToken() return the PREVIOUS user's token.
+            (0, consoleApiHelpers_1.resetHubBearerToken)(page);
             await page.goto('about:blank');
             await page
                 .evaluate(() => {
@@ -407,8 +435,12 @@ async function assertTestUsesCorrectOrganization(page) {
     const homePage = new HomePage_1.HomePage(page);
     if (page.url().includes('?code=') || page.url().includes('&state=')) {
         console.log('OAuth callback detected, waiting for redirect...');
+        // Camunda Hub (which replaced Console on SaaS) only exchanges the code
+        // once its SPA has booted, and on CI runners that boot alone was measured
+        // at ~45s past /login-callback -- a 30s wait aborted the exchange on every
+        // attempt. Ported from the already-verified 8.9/8.10 fix.
         await page.waitForURL((url) => !url.toString().includes('?code='), {
-            timeout: 30000,
+            timeout: 120000,
         });
         await (0, sleep_1.sleep)(5000);
     }
@@ -418,7 +450,20 @@ async function assertTestUsesCorrectOrganization(page) {
         await (0, test_1.expect)(homePage.modelerBanner).toBeVisible({ timeout: 30000 });
     }
     else {
-        await (0, test_1.expect)(homePage.consoleBanner).toBeVisible({ timeout: 30000 });
+        await (0, test_1.expect)(homePage.consoleBanner.or(homePage.hubHeader)).toBeVisible({
+            timeout: 60000,
+        });
+    }
+    // Camunda Hub replaces Console on SaaS (8.10 release notes), and the Hub
+    // shell has neither the "Camunda logo Console" link nor the "Open
+    // Organizations" switcher, and lands on /workspaces without the org id in
+    // the URL. Its sidebar scopes the Clusters/Organization links to the active
+    // org, so assert the expected org id there instead.
+    if (await homePage.hubHeader.isVisible()) {
+        await (0, test_1.expect)(homePage.hubSidebar
+            .locator(`a[href*="/org/${process.env.ORG_ID}/"]`)
+            .first()).toBeVisible({ timeout: 180000 });
+        return;
     }
     await (0, test_1.expect)(homePage.openOrganizationButton).toBeVisible({ timeout: 180000 });
     try {

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

@@ -18,7 +18,8 @@ _8_8_1.test.describe('Cluster Setup Tests', () => {
         await (0, _setup_1.captureScreenshot)(page, testInfo);
         await (0, _setup_1.captureFailureVideo)(page, testInfo);
     });
-    (0, _8_8_1.test)('Enable Alpha Features', async ({ page, loginPage, consoleOrganizationsPage, homePage, }, testInfo) => {
+    // Skipped due to bug #29346: https://github.com/camunda/camunda-hub/issues/29346
+    _8_8_1.test.skip('Enable Alpha Features', async ({ page, loginPage, consoleOrganizationsPage, homePage, }, testInfo) => {
         _8_8_1.test.skip(process.env.IS_PROD === 'true', 'Skipping test because not required on PROD test org');
         _8_8_1.test.skip(process.env.IS_AG === 'true', 'Skipping test because not required when IS_AG is true');
         await (0, UtilitiesPage_1.loginWithRetry)(page, loginPage, users_1.testUsers.mainUser, (testInfo.workerIndex + 1) * 1000);
@@ -45,6 +46,14 @@ _8_8_1.test.describe('Cluster Setup Tests', () => {
             await (0, consoleApiHelpers_1.waitForClusterHealthyViaApi)(page, clusterUuid);
             await homePage.clickClusters();
         }
+        // Whichever way the cluster was just created -- through the UI above or via
+        // the API in the else branch -- link it to the suite's shared Hub
+        // workspace: Hub gates deployment on the ENVIRONMENTS assigned to a
+        // workspace, so a cluster the workspace does not list is invisible in every
+        // deploy dialog. A no-op when the workspace does not exist yet (this test
+        // races the workspace-creating ones), which the deploy-time ensure-link
+        // then covers.
+        await (0, consoleApiHelpers_1.linkClusterToSharedWorkspaceViaApi)(page, clusterName);
         await clusterPage.clickClusterLink(clusterName);
         await clusterDetailsPage.assertComponentsHealth();
         // API-client creation is needed whenever this run will also exercise the
@@ -94,6 +103,14 @@ _8_8_1.test.describe('Cluster Setup Tests', () => {
             await (0, consoleApiHelpers_1.waitForClusterHealthyViaApi)(page, clusterUuid, 1500000);
             await homePage.clickClusters();
         }
+        // Whichever way the cluster was just created -- through the UI above or via
+        // the API in the else branch -- link it to the suite's shared Hub
+        // workspace: Hub gates deployment on the ENVIRONMENTS assigned to a
+        // workspace, so a cluster the workspace does not list is invisible in every
+        // deploy dialog. A no-op when the workspace does not exist yet (this test
+        // races the workspace-creating ones), which the deploy-time ensure-link
+        // then covers.
+        await (0, consoleApiHelpers_1.linkClusterToSharedWorkspaceViaApi)(page, clusterName);
         await clusterPage.clickClusterLink(clusterName);
         await clusterDetailsPage.assertComponentsHealth();
         if (process.env.IS_AG !== 'true') {
@@ -107,11 +124,17 @@ _8_8_1.test.describe('Cluster Setup Tests', () => {
                 await (0, UtilitiesPage_1.loginWithRetry)(page, loginPage, user, (testInfo.workerIndex + 1) * 1000);
             });
             await _8_8_1.test.step('Navigate to Web Modeler', async () => {
-                await (0, test_1.expect)(homePage.camundaComponentsButton).toBeVisible({
+                // Camunda Hub replaced Console + Web Modeler on SaaS: it lands on the
+                // Modeler home directly and has no app switcher to wait for.
+                await (0, test_1.expect)(homePage.camundaComponentsButton.or(homePage.hubHeader)).toBeVisible({
                     timeout: 120000,
                 });
-                await appsPage.clickCamundaApps();
-                await appsPage.clickModeler();
+                // Camunda Hub (hub.*) replaced Console + Web Modeler on SaaS and has no
+                // app switcher: its home already is the Modeler home.
+                if (!new URL(page.url()).hostname.startsWith('hub.')) {
+                    await appsPage.clickCamundaApps();
+                    await appsPage.clickModeler();
+                }
                 await (0, test_1.expect)(modelerHomePage.modelerPageBanner).toBeVisible({
                     timeout: 180000,
                 });
@@ -120,6 +143,8 @@ _8_8_1.test.describe('Cluster Setup Tests', () => {
                 await homePage.clickSkipCustomization();
                 await modelerHomePage.createCrossComponentProjectFolder();
                 await modelerHomePage.clickHomeBreadcrumb();
+                // Hub resets the overview to "My workspaces" on every load.
+                await modelerHomePage.showAllWorkspaces(10000);
                 // The project-rename PATCH commits on the backend, but navigating to
                 // Home right after can render the SPA's stale (pre-rename) project
                 // list without refetching, so the folder never appears under a plain

package/dist/utils/consoleApiHelpers.d.ts

@@ -9,3 +9,8 @@ export declare function waitForClusterHealthyViaApi(page: Page, clusterUuid: str
 export declare function waitForClusterRestartHealthyViaApi(page: Page, clusterUuid: string, timeoutMs?: number): Promise<void>;
 export declare function areAiFeaturesEnabledViaApi(page: Page): Promise<boolean>;
 export declare function waitForAiFeaturesEnabledViaApi(page: Page, timeoutMs?: number): Promise<void>;
+export declare function linkClusterToWorkspaceViaApi(page: Page, workspaceId: string, clusterName: string): Promise<void>;
+export declare function rememberHubWorkspaceId(page: Page, workspaceId: string): void;
+export declare function getHubWorkspaceId(page: Page): string | undefined;
+export declare function linkClusterToSharedWorkspaceViaApi(page: Page, clusterName: string): Promise<void>;
+export declare function ensureClusterLinkedToSharedWorkspace(page: Page, clusterName: string): Promise<void>;