@bigbinary/neeto-playwright-commons 1.24.0 → 1.24.2

package/index.cjs.js

@@ -156,6 +156,9 @@ class CustomDomainApi {
             url: `${BASE_URL}/custom_domains/${customDomain}`,
             method: "delete",
         });
+        this.fetch = () => this.neetoPlaywrightUtilities.apiRequest({
+            url: `${BASE_URL}/custom_domains`,
+        });
     }
 }
 
@@ -4431,6 +4434,8 @@ const DATE_RANGES = {
     before: "Before",
     customDateRange: "Custom date range",
 };
+const CERTIFICATE_LIMIT_EXCEEDED_REGEXP = `too many certificates \\(\\d+\\) already issued for "${CUSTOM_DOMAIN_SUFFIX}"`;
+const CERTIFICATE_LIMIT_EXCEEDED_MESSAGE = "Certificate limit exceeded for custom domain";
 
 const COMMON_SELECTORS = {
     emailInputError: "email-input-error",
@@ -116153,14 +116158,24 @@ class GooglePage extends IntegrationBase {
             await this.page.waitForLoadState("load", { timeout: 25000 });
             await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.myAccount));
         };
-        this.enterTotpCode = (locator) => test.expect(async () => {
-            const totpToken = this.totp.generate({ timestamp: Date.now() + 5000 });
-            await this.page.getByLabel(GOOGLE_LOGIN_TEXTS.enterCode).fill(totpToken);
-            test.expect(this.totp.validate({ token: totpToken })).not.toBeNull();
-            await this.page.locator(GOOGLE_LOGIN_SELECTORS.totpNext).click();
-            await test.expect(this.page.getByText(GOOGLE_LOGIN_TEXTS.wrongCode)).toBeHidden({ timeout: 15000 });
-            await test.expect(locator).toBeHidden({ timeout: 10000 });
-        }).toPass({ timeout: 50000 });
+        this.enterTotpCode = async (locator) => {
+            let previousToken = null;
+            await test.expect(async () => {
+                let totpToken = this.totp.generate({ timestamp: Date.now() });
+                if (totpToken === previousToken) {
+                    const remainingTime = this.totp.remaining({ timestamp: Date.now() });
+                    // eslint-disable-next-line playwright/no-wait-for-timeout
+                    await this.page.waitForTimeout(remainingTime + 500); // Wait for the remaining time plus a small buffer (500ms) to ensure new token
+                    totpToken = this.totp.generate({ timestamp: Date.now() });
+                }
+                previousToken = totpToken;
+                await this.page.getByLabel(GOOGLE_LOGIN_TEXTS.enterCode).fill(totpToken);
+                test.expect(this.totp.validate({ token: totpToken })).not.toBeNull();
+                await this.page.locator(GOOGLE_LOGIN_SELECTORS.totpNext).click();
+                await test.expect(this.page.getByText(GOOGLE_LOGIN_TEXTS.wrongCode)).toBeHidden({ timeout: 10000 });
+                await test.expect(locator).toBeHidden({ timeout: 10000 });
+            }).toPass({ timeout: 2 * 60 * 1000 });
+        };
         this.logoutFromGoogle = async () => {
             await this.page.goto(THIRD_PARTY_ROUTES.google.myAccount, {
                 timeout: 20000,
@@ -118165,13 +118180,20 @@ class CustomDomainPage {
                 test.expect(this.page.getByTestId(COMMON_SELECTORS.paneHeader).getByText(domain)).toBeVisible(),
             ]);
             await this.neetoPlaywrightUtilities.waitForPageLoad();
+            let isCertificateLimitExceeded = false;
             await test.expect(async () => {
+                isCertificateLimitExceeded = await this.isCertificateLimitExceeded();
+                if (isCertificateLimitExceeded)
+                    return;
                 await validateButton.click();
                 await this.neetoPlaywrightUtilities.verifyToast({
-                    timeout: 20000,
                     message: this.t("neetoCustomDomains.validation.successMessage"),
                 });
             }).toPass({ timeout: 60000 });
+            if (isCertificateLimitExceeded) {
+                test.test.skip(true, CERTIFICATE_LIMIT_EXCEEDED_MESSAGE);
+                return;
+            }
             await this.neetoPlaywrightUtilities.waitForPageLoad();
             await test.expect(this.page.getByTestId(CUSTOM_DOMAIN_SELECTORS.activeTagContainer)).toBeVisible();
         };
@@ -118234,8 +118256,15 @@ class CustomDomainPage {
             await this.waitForTrustedSSL();
             await this.waitForDomainPropagation();
         };
+        this.getCustomDomainFromAPI = async () => {
+            const { custom_domains } = await this.customDomainApi
+                .fetch()
+                .then(response => response === null || response === void 0 ? void 0 : response.json());
+            return custom_domains;
+        };
         this.disconnectCustomDomain = async () => {
-            if (shouldSkipCustomDomainSetup())
+            const customDomains = await this.getCustomDomainFromAPI();
+            if (ramda.isEmpty(customDomains))
                 return;
             const baseURL = baseURLGenerator(this.product, this.subdomain);
             await this.neetoPlaywrightUtilities.waitForPageLoad();
@@ -118253,13 +118282,15 @@ class CustomDomainPage {
             await test.expect(this.page.getByTestId(COMMON_SELECTORS.noDataTitle)).toBeVisible();
         };
         this.disconnectViaRequest = async () => {
-            if (shouldSkipCustomDomainSetup())
-                return;
-            const customDomain = this.getCustomDomain(this.subdomain);
-            if (!neetoCist.isPresent(customDomain))
+            const customDomains = await this.getCustomDomainFromAPI();
+            if (ramda.isEmpty(customDomains))
                 return;
-            await this.customDomainApi.delete(customDomain);
+            await Promise.all(customDomains.map(({ hostname }) => this.customDomainApi.delete(hostname)));
         };
+        this.isCertificateLimitExceeded = () => this.page
+            .getByTestId(COMMON_SELECTORS.paneBody)
+            .getByText(RegExp(CERTIFICATE_LIMIT_EXCEEDED_REGEXP, "i"))
+            .isVisible();
         this.page = page;
         this.browser = browser;
         this.product = product;
@@ -123869,6 +123900,7 @@ dotenvExpand.expand(env);
 if (require$$0__namespace.existsSync("./e2e/config/.env.local")) {
     const localEnv = dotenv.config({
         path: "./e2e/config/.env.local",
+        quiet: true,
     });
     dotenvExpand.expand(localEnv);
 }
@@ -123982,6 +124014,8 @@ exports.ApiKeysApi = ApiKeysApi;
 exports.ApiKeysPage = ApiKeysPage;
 exports.AuditLogsPage = AuditLogsPage;
 exports.BASE_URL = BASE_URL;
+exports.CERTIFICATE_LIMIT_EXCEEDED_MESSAGE = CERTIFICATE_LIMIT_EXCEEDED_MESSAGE;
+exports.CERTIFICATE_LIMIT_EXCEEDED_REGEXP = CERTIFICATE_LIMIT_EXCEEDED_REGEXP;
 exports.CHANGELOG_WIDGET_SELECTORS = CHANGELOG_WIDGET_SELECTORS;
 exports.CHAT_WIDGET_SELECTORS = CHAT_WIDGET_SELECTORS;
 exports.CHAT_WIDGET_TEXTS = CHAT_WIDGET_TEXTS;