@camunda/e2e-test-suite 0.0.1424 → 0.0.1425

package/dist/pages/8.10/UtilitiesPage.js

@@ -11,6 +11,7 @@ const LoginPage_1 = require("./LoginPage");
 const fileUpload_1 = require("../../utils/fileUpload");
 const mailSlurpClient_1 = require("../../utils/mailSlurpClient");
 const consoleApiHelpers_1 = require("../../utils/consoleApiHelpers");
+const hubOrganization_1 = require("../../utils/hubOrganization");
 async function clearWebStorage(page) {
     await page
         .evaluate(() => {
@@ -823,9 +824,7 @@ async function assertTestUsesCorrectOrganization(page) {
     // 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 });
+        await (0, hubOrganization_1.ensureHubOrganization)(page, homePage.hubSidebar);
         return;
     }
     await (0, test_1.expect)(homePage.openOrganizationButton).toBeVisible({ timeout: 180000 });

package/dist/pages/8.11/UtilitiesPage.js

@@ -11,6 +11,7 @@ const LoginPage_1 = require("./LoginPage");
 const fileUpload_1 = require("../../utils/fileUpload");
 const mailSlurpClient_1 = require("../../utils/mailSlurpClient");
 const consoleApiHelpers_1 = require("../../utils/consoleApiHelpers");
+const hubOrganization_1 = require("../../utils/hubOrganization");
 async function clearWebStorage(page) {
     await page
         .evaluate(() => {
@@ -823,9 +824,7 @@ async function assertTestUsesCorrectOrganization(page) {
     // 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 });
+        await (0, hubOrganization_1.ensureHubOrganization)(page, homePage.hubSidebar);
         return;
     }
     await (0, test_1.expect)(homePage.openOrganizationButton).toBeVisible({ timeout: 180000 });

package/dist/pages/8.8/UtilitiesPage.js

@@ -10,6 +10,7 @@ const randomSleep_1 = require("../../utils/randomSleep");
 const SettingsPage_1 = require("./SettingsPage");
 const fileUpload_1 = require("../../utils/fileUpload");
 const consoleApiHelpers_1 = require("../../utils/consoleApiHelpers");
+const hubOrganization_1 = require("../../utils/hubOrganization");
 async function forceLogoutIfNeeded(page) {
     const settingsPage = new SettingsPage_1.SettingsPage(page);
     const loginMessage = page.getByText('Log in to continue to Camunda.');
@@ -526,9 +527,7 @@ async function assertTestUsesCorrectOrganization(page) {
     // 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 });
+        await (0, hubOrganization_1.ensureHubOrganization)(page, homePage.hubSidebar);
         return;
     }
     await (0, test_1.expect)(homePage.openOrganizationButton).toBeVisible({ timeout: 180000 });

package/dist/pages/8.9/UtilitiesPage.js

@@ -11,6 +11,7 @@ const fileUpload_1 = require("../../utils/fileUpload");
 const mailSlurpClient_1 = require("../../utils/mailSlurpClient");
 const hubTableRow_1 = require("../../utils/hubTableRow");
 const consoleApiHelpers_1 = require("../../utils/consoleApiHelpers");
+const hubOrganization_1 = require("../../utils/hubOrganization");
 // Tracks which worker-derived `timeout` values have already paid the
 // stagger sleep below, so a worker only pays it once per process lifetime
 // rather than on every call -- see the comment at the call site.
@@ -523,9 +524,7 @@ async function assertTestUsesCorrectOrganization(page) {
     // 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 });
+        await (0, hubOrganization_1.ensureHubOrganization)(page, homePage.hubSidebar);
         return;
     }
     await (0, test_1.expect)(homePage.openOrganizationButton).toBeVisible({ timeout: 180000 });

package/dist/utils/hubOrganization.d.ts

@@ -0,0 +1,13 @@
+import { Locator, Page } from '@playwright/test';
+/**
+ * Makes Camunda Hub show the org the run is configured for.
+ *
+ * A user who belongs to several orgs lands in whichever one Hub opens first,
+ * which is not necessarily ORG_ID (prod's test user is in both "Automation QA"
+ * and "Automation QA 2"). Hub's header exposes a "Switch organization" menu,
+ * so pick the org by name when the sidebar's org-scoped links point elsewhere.
+ *
+ * Prod only: other environments use a throwaway org with a single membership,
+ * so there the sidebar assertion runs unchanged.
+ */
+export declare function ensureHubOrganization(page: Page, sidebar: Locator): Promise<void>;

package/dist/utils/hubOrganization.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureHubOrganization = void 0;
+const test_1 = require("@playwright/test");
+/**
+ * Makes Camunda Hub show the org the run is configured for.
+ *
+ * A user who belongs to several orgs lands in whichever one Hub opens first,
+ * which is not necessarily ORG_ID (prod's test user is in both "Automation QA"
+ * and "Automation QA 2"). Hub's header exposes a "Switch organization" menu,
+ * so pick the org by name when the sidebar's org-scoped links point elsewhere.
+ *
+ * Prod only: other environments use a throwaway org with a single membership,
+ * so there the sidebar assertion runs unchanged.
+ */
+async function ensureHubOrganization(page, sidebar) {
+    const orgId = process.env.ORG_ID;
+    const orgScopedLink = sidebar.locator(`a[href*="/org/${orgId}/"]`).first();
+    if (process.env.IS_PROD !== 'true') {
+        await (0, test_1.expect)(orgScopedLink).toBeVisible({ timeout: 180000 });
+        return;
+    }
+    const alreadyOnOrg = await orgScopedLink
+        .waitFor({ state: 'visible', timeout: 15000 })
+        .then(() => true)
+        .catch(() => false);
+    if (!alreadyOnOrg && process.env.ORG_NAME) {
+        await page
+            .getByRole('banner')
+            .getByRole('button', { name: 'Switch organization' })
+            .click({ timeout: 30000 });
+        await page
+            .getByRole('menuitem', { name: process.env.ORG_NAME, exact: true })
+            .click({ timeout: 30000 });
+    }
+    await (0, test_1.expect)(orgScopedLink).toBeVisible({ timeout: 180000 });
+}
+exports.ensureHubOrganization = ensureHubOrganization;

package/package.json

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