@bigbinary/neeto-playwright-commons 1.21.2 → 1.21.3

package/index.cjs.js

@@ -188841,12 +188841,12 @@ const ROUTES = {
     dashboard: "/dashboard",
     neetoThankYou: "/neeto_thank_you_engine",
     adminPanel: {
-        roles: "/admin/admin-panel/roles",
-        index: "/admin/admin-panel",
-        auditLogs: "/admin/admin-panel/audit-logs",
-        apiKeys: "/admin/admin-panel/apiKeys",
-        customDomain: "/admin/admin-panel/custom-domain",
-        ipRestriction: "/admin/admin-panel/ip-restriction",
+        roles: "/admin/general/admin-panel/roles",
+        index: "/admin/general/admin-panel",
+        auditLogs: "/admin/admin-panel/general/audit-logs",
+        apiKeys: "/admin/admin-panel/general/apiKeys",
+        customDomain: "/admin/admin-panel/general/custom-domain",
+        ipRestriction: "/admin/admin-panel/general/ip-restriction",
     },
 };
 const API_ROUTES = {
@@ -191401,14 +191401,15 @@ class SlackPage extends IntegrationBase {
             const loginButton = this.page.getByRole("button", {
                 name: this.t("neetoSlack.slack.connect.loginButton"),
             });
+            const allowButton = this.page.getByRole("button", {
+                name: SLACK_WEB_TEXTS.allow,
+            });
             if (await loginButton.isVisible()) {
                 await loginButton.click({ delay: 5000 });
                 await this.page.waitForURL(RegExp("(.*)slack.com/.*"));
             }
-            const allowButton = this.page.getByRole("button", {
-                name: SLACK_WEB_TEXTS.allow,
-            });
-            await test$1.expect(allowButton).toBeEnabled({ timeout: 30000 });
+            await this.page.waitForLoadState("domcontentloaded", { timeout: 25000 });
+            await test$1.expect(allowButton).toBeEnabled({ timeout: 45000 });
             const currentWorkspace = (await this.page
                 .locator(SLACK_SELECTORS.teamPicketButtonContent)
                 .textContent()) || "";
@@ -191485,6 +191486,7 @@ class SlackPage extends IntegrationBase {
                 ramda.isNotNil(slackLoginPassword) &&
                 ramda.isNotNil(slackLoginEmail)) {
                 await slackWebappPage.goto(THIRD_PARTY_ROUTES.slack.loginWithPassword(slackWorkspace), { timeout: 20000 });
+                await slackWebappPage.waitForLoadState("load", { timeout: 25000 });
                 await slackWebappPage
                     .locator(SLACK_SELECTORS.loginEmail)
                     .pressSequentially(slackLoginEmail, { delay: 10 });
@@ -191492,6 +191494,9 @@ class SlackPage extends IntegrationBase {
                     .locator(SLACK_SELECTORS.loginPassword)
                     .pressSequentially(slackLoginPassword, { delay: 10 });
                 await slackWebappPage.locator(SLACK_SELECTORS.signInButton).click();
+                await slackWebappPage.waitForLoadState("domcontentloaded", {
+                    timeout: 25000,
+                });
                 const redirectOpenInBrowser = slackWebappPage.locator(SLACK_SELECTORS.redirectOpenInBrowser);
                 await test$1.expect(redirectOpenInBrowser).toBeVisible({ timeout: 25000 });
                 await redirectOpenInBrowser.click();
@@ -193110,44 +193115,7 @@ class AuditLogsPage {
 }
 
 class CustomDomainPage {
-    constructor(page, neetoPlaywrightUtilities, browser // Made optional to avoid breaking changes during the compliance release
-    ) {
-        this.addCustomDomainViaUI = async (domainName) => {
-            const addCustomDomainButton = this.page.getByTestId(CUSTOM_DOMAIN_SELECTORS.addCustomDomainButton);
-            await test$1.expect(addCustomDomainButton).toBeVisible();
-            (await addCustomDomainButton.isDisabled()) &&
-                (await this.deleteCustomDomainViaUI());
-            await addCustomDomainButton.click();
-            await test$1.expect(this.page.getByTestId(COMMON_SELECTORS.paneBody)).toBeVisible();
-            await this.page
-                .getByTestId(CUSTOM_DOMAIN_SELECTORS.customDomainInputField)
-                .fill(domainName);
-            await this.page
-                .getByTestId(CUSTOM_DOMAIN_SELECTORS.submitCustomDomainButton)
-                .click();
-            await Promise.all([
-                test$1.expect(this.page.getByTestId(COMMON_SELECTORS.paneBody).getByText(domainName)).toBeVisible(),
-                test$1.expect(this.page.getByTestId(CUSTOM_DOMAIN_SELECTORS.customDomainValidateButton)).toBeVisible(),
-            ]);
-            await this.page.getByTestId(COMMON_SELECTORS.paneModalCrossIcon).click();
-            await Promise.all([
-                test$1.expect(this.page.getByTestId(COMMON_SELECTORS.paneBody)).toBeHidden(),
-                test$1.expect(addCustomDomainButton).toBeDisabled(),
-                test$1.expect(this.page.getByTestId(COMMON_SELECTORS.pendingTagContainer)).toBeVisible(),
-            ]);
-        };
-        this.deleteCustomDomainViaUI = async () => {
-            await this.page.getByTestId(CUSTOM_DOMAIN_SELECTORS.dropdownButton).click();
-            await this.page
-                .getByTestId(CUSTOM_DOMAIN_SELECTORS.deleteCustomDomainButton)
-                .click();
-            await test$1.expect(this.page.getByTestId(COMMON_SELECTORS.alertTitle)).toHaveText(this.t("neetoCustomDomains.delete"));
-            await this.page
-                .getByTestId(COMMON_SELECTORS.alertModalSubmitButton)
-                .click();
-            await this.neetoPlaywrightUtilities.verifyToast();
-            await test$1.expect(this.page.getByTestId(COMMON_SELECTORS.noDataTitle)).toBeVisible();
-        };
+    constructor({ browser, page, neetoPlaywrightUtilities, product, }) {
         this.getCustomDomain = (newSubdomain) => {
             const { subdomainName } = getGlobalUserState();
             this.subdomain = newSubdomain !== null && newSubdomain !== void 0 ? newSubdomain : subdomainName;
@@ -193173,6 +193141,7 @@ class CustomDomainPage {
             await test$1.expect(async () => {
                 await validateButton.click();
                 await this.neetoPlaywrightUtilities.verifyToast({
+                    timeout: 15000,
                     message: this.t("neetoCustomDomains.validation.successMessage"),
                 });
             }).toPass({ timeout: 60000 });
@@ -193180,13 +193149,14 @@ class CustomDomainPage {
             await test$1.expect(this.page.getByTestId(CUSTOM_DOMAIN_SELECTORS.activeTagContainer)).toBeVisible();
         };
         this.loginToCustomDomain = async () => {
-            void this.page.close();
+            await this.page.close();
             const loginPage = this.loginPage;
             const { email } = getGlobalUserState();
             const loginUrl = `${this.baseURL}${ROUTES.admin}`;
             const playwrightUtils = new CustomCommands(loginPage, loginPage.request);
             const organizationPage = new OrganizationPage(loginPage, playwrightUtils);
             await loginPage.goto(loginUrl);
+            await playwrightUtils.waitForPageLoad();
             await organizationPage.loginViaSSO(email);
             await test$1.expect(loginPage).toHaveURL(RegExp(loginUrl), { timeout: 15000 });
             await playwrightUtils.waitForPageLoad();
@@ -193211,21 +193181,22 @@ class CustomDomainPage {
             updateCredentials({ key: "baseUrl", value: this.baseURL });
             updateCredentials({ key: "domain", value: CUSTOM_DOMAIN_SUFFIX });
         };
-        this.setupCustomDomain = async (product) => {
+        this.setupCustomDomain = async () => {
             if (shouldSkipCustomDomainSetup())
                 return;
-            await this.connectCustomDomain(product);
+            await this.connectCustomDomain();
             const context = await this.browser.newContext(EMPTY_STORAGE_STATE);
             this.loginPage = await context.newPage();
             await this.loginToCustomDomain();
             await this.saveCustomDomainState();
         };
-        this.connectCustomDomain = async (product, subdomain) => {
+        this.connectCustomDomain = async (subdomain) => {
             if (shouldSkipCustomDomainSetup())
                 return;
-            const baseURL = baseURLGenerator(product, subdomain);
+            const baseURL = baseURLGenerator(this.product, subdomain);
             const domain = this.getCustomDomain(subdomain);
             this.baseURL = `https://${domain}`;
+            await this.neetoPlaywrightUtilities.waitForPageLoad();
             await this.page.goto(`${baseURL}${ROUTES.adminPanel.customDomain}`);
             await this.neetoPlaywrightUtilities.waitForPageLoad();
             await this.addCustomDomain(domain);
@@ -193233,10 +193204,11 @@ class CustomDomainPage {
             process.env.BASE_URL = this.baseURL;
             await this.waitForTrustedSSL();
         };
-        this.disconnectCustomDomain = async (product, subdomain) => {
+        this.disconnectCustomDomain = async () => {
             if (shouldSkipCustomDomainSetup())
                 return;
-            const baseURL = baseURLGenerator(product, subdomain);
+            const baseURL = baseURLGenerator(this.product, this.subdomain);
+            await this.neetoPlaywrightUtilities.waitForPageLoad();
             await this.page.goto(`${baseURL}${ROUTES.adminPanel.customDomain}`);
             await this.neetoPlaywrightUtilities.waitForPageLoad();
             await this.page.getByTestId(CUSTOM_DOMAIN_SELECTORS.dropdownButton).click();
@@ -193250,10 +193222,11 @@ class CustomDomainPage {
             await this.neetoPlaywrightUtilities.verifyToast();
             await test$1.expect(this.page.getByTestId(COMMON_SELECTORS.noDataTitle)).toBeVisible();
         };
-        this.browser = browser;
         this.page = page;
-        this.neetoPlaywrightUtilities = neetoPlaywrightUtilities;
+        this.browser = browser;
+        this.product = product;
         this.t = playwrightI18nextFixture.getI18nInstance().t;
+        this.neetoPlaywrightUtilities = neetoPlaywrightUtilities;
     }
 }
 
@@ -195482,7 +195455,7 @@ exports.CREDENTIALS = CREDENTIALS;
 exports.CUSTOM_DOMAIN_SELECTORS = CUSTOM_DOMAIN_SELECTORS;
 exports.CUSTOM_DOMAIN_SUFFIX = CUSTOM_DOMAIN_SUFFIX;
 exports.CustomCommands = CustomCommands;
-exports.CustomDomainsPage = CustomDomainPage;
+exports.CustomDomainPage = CustomDomainPage;
 exports.DATE_PICKER_SELECTORS = DATE_PICKER_SELECTORS;
 exports.DATE_TEXTS = DATE_TEXTS;
 exports.DESCRIPTION_EDITOR_TEXTS = DESCRIPTION_EDITOR_TEXTS;