@bigbinary/neeto-playwright-commons 1.22.26 → 1.22.28

package/index.cjs.js

@@ -119,6 +119,7 @@ const THIRD_PARTY_ROUTES = {
         challengeSelection: "https://accounts.google.com/v3/signin/challenge/selection",
         myAccount: "https://myaccount.google.com/",
         chooseAccount: "accounts.google.com/o/oauth2/auth/oauthchooseaccount",
+        accountchooser: "accounts.google.com/v3/signin/accountchooser",
         consentScreen: "accounts.google.com/signin/oauth/consent",
         warningScreen: "accounts.google.com/signin/oauth/warning",
         additionalInfoScreen: "accounts.google.com/signin/oauth/id",
@@ -4515,18 +4516,20 @@ class CustomCommands {
                 await test$1.expect(filtersSearchTermBlock).toBeHidden();
             }
         };
-        this.saveChanges = ({ isPane = false, customPageContext = this.page, closeAfterVerification = true, } = {}) => {
+        this.saveChanges = ({ isPane = false, customPageContext = this.page, closeAfterVerification = true, toastMessage = "", } = {}) => {
             const pane = customPageContext.getByTestId(COMMON_SELECTORS.backdrop);
             const baseLocator = isPane ? pane : customPageContext;
             return Promise.all([
-                baseLocator
-                    .getByTestId(COMMON_SELECTORS.saveChangesButton)
-                    .click({ timeout: 10000 }),
+                this.clickButtonAndAwaitLoad({
+                    locator: baseLocator.getByTestId(COMMON_SELECTORS.saveChangesButton),
+                    timeout: 10000,
+                }),
                 // eslint-disable-next-line playwright/missing-playwright-await
                 isPane && test$1.expect(pane).toBeHidden({ timeout: 10000 }),
                 this.verifyToast({
                     closeAfterVerification,
                     customPageContext,
+                    message: toastMessage,
                     timeout: 20000,
                 }),
             ]);
@@ -4608,6 +4611,17 @@ class CustomCommands {
             test$1.expect(cardLocator.getByTestId(ADMIN_PANEL_SELECTORS.settingsItemDescription)).toHaveText(description),
             test$1.expect(this.page.getByTestId(COMMON_SELECTORS.sidebarSubLink(title))).toHaveCSS("background-color", COLOR.transparent),
         ]);
+        this.clickButtonAndAwaitLoad = async ({ locator, timeout, }) => {
+            await locator.click({ timeout });
+            await test$1.expect(locator.getByTestId(COMMON_SELECTORS.uiSpinner)).toBeHidden({
+                timeout: 35000,
+            });
+        };
+        this.toggleElement = ({ locator, shouldBeChecked = true }) => test$1.expect(async () => {
+            const isChecked = await locator.isChecked();
+            isChecked !== shouldBeChecked && (await locator.click());
+            await test$1.expect(locator).toBeChecked({ checked: shouldBeChecked });
+        }).toPass({ timeout: 15000 });
         this.page = page;
         this.responses = [];
         this.request = request;
@@ -179855,7 +179869,7 @@ const commands = {
         await use(commands);
     },
     page: async ({ page }, use) => {
-        await page.goto("/", { timeout: 20000 });
+        await page.goto("/", { timeout: 35000 });
         await page.waitForLoadState();
         await use(page);
     },
@@ -191452,9 +191466,14 @@ class GooglePage extends IntegrationBase {
             integration,
             integrationRouteIndex,
         });
+        this.waitForGoogleAuthURL = async () => {
+            await this.page.waitForLoadState("load", { timeout: 25000 });
+            await this.page.waitForURL(new RegExp(`${THIRD_PARTY_ROUTES.google.accountchooser}|${THIRD_PARTY_ROUTES.google.chooseAccount}`));
+        };
         this.connectGoogleAccount = async (appName) => {
-            await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.chooseAccount));
+            await this.waitForGoogleAuthURL();
             await this.selectGoogleAccount(appName);
+            await this.page.waitForLoadState("load", { timeout: 25000 });
             await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.consentScreen));
             await this.page
                 .getByRole("button", { name: GOOGLE_LOGIN_TEXTS.allow })
@@ -191483,19 +191502,20 @@ class GooglePage extends IntegrationBase {
             await test$1.expect(signInHeading).toBeHidden({ timeout: 10000 });
         };
         this.loginToGoogle = async () => {
+            if (ramda.isNil(process.env.GOOGLE_LOGIN_EMAIL) ||
+                ramda.isNil(process.env.GOOGLE_LOGIN_PASSWORD)) {
+                throw new Error("ENV variable GOOGLE_LOGIN_EMAIL or GOOGLE_LOGIN_PASSWORD is not properly configured");
+            }
             await this.page.goto(THIRD_PARTY_ROUTES.google.signin, { timeout: 20000 });
-            if (!ramda.isNotNil(process.env.GOOGLE_LOGIN_EMAIL))
-                return;
             await this.page
                 .getByLabel(GOOGLE_LOGIN_TEXTS.emailOrPhone)
                 .pressSequentially(process.env.GOOGLE_LOGIN_EMAIL, { delay: 10 });
             await this.page
                 .getByRole("button", { name: GOOGLE_LOGIN_TEXTS.next })
                 .click();
+            await this.page.waitForLoadState("load", { timeout: 25000 });
             await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.password));
             await test$1.expect(this.page.getByText(GOOGLE_LOGIN_TEXTS.showPassword)).toBeVisible();
-            if (!ramda.isNotNil(process.env.GOOGLE_LOGIN_PASSWORD))
-                return;
             await this.page
                 .getByLabel(GOOGLE_LOGIN_TEXTS.enterYourPassword)
                 .pressSequentially(process.env.GOOGLE_LOGIN_PASSWORD, { delay: 10 });
@@ -191507,6 +191527,7 @@ class GooglePage extends IntegrationBase {
                 (await this.page
                     .locator(GOOGLE_LOGIN_SELECTORS.totpChallengeSelector)
                     .click());
+            await this.page.waitForLoadState("load", { timeout: 25000 });
             await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.totpChallenge));
             const twoStepVerification = this.page.locator("form").getByRole("heading", {
                 name: GOOGLE_LOGIN_TEXTS.twoStepVerification,
@@ -191515,18 +191536,17 @@ class GooglePage extends IntegrationBase {
             });
             await test$1.expect(twoStepVerification).toBeVisible();
             await this.enterTotpCode(twoStepVerification);
-            await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.myAccount), { waitUntil: "load" });
-        };
-        this.enterTotpCode = async (locator) => {
-            await test$1.expect(async () => {
-                const totpToken = this.totp.generate({ timestamp: Date.now() + 5000 });
-                await this.page.getByLabel(GOOGLE_LOGIN_TEXTS.enterCode).fill(totpToken);
-                test$1.expect(this.totp.validate({ token: totpToken })).not.toBeNull();
-                await this.page.locator(GOOGLE_LOGIN_SELECTORS.totpNext).click();
-                await test$1.expect(this.page.getByText(GOOGLE_LOGIN_TEXTS.wrongCode)).toBeHidden({ timeout: 15000 });
-                await test$1.expect(locator).toBeHidden({ timeout: 10000 });
-            }).toPass({ timeout: 50000 });
+            await this.page.waitForLoadState("load", { timeout: 25000 });
+            await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.myAccount));
         };
+        this.enterTotpCode = (locator) => test$1.expect(async () => {
+            const totpToken = this.totp.generate({ timestamp: Date.now() + 5000 });
+            await this.page.getByLabel(GOOGLE_LOGIN_TEXTS.enterCode).fill(totpToken);
+            test$1.expect(this.totp.validate({ token: totpToken })).not.toBeNull();
+            await this.page.locator(GOOGLE_LOGIN_SELECTORS.totpNext).click();
+            await test$1.expect(this.page.getByText(GOOGLE_LOGIN_TEXTS.wrongCode)).toBeHidden({ timeout: 15000 });
+            await test$1.expect(locator).toBeHidden({ timeout: 10000 });
+        }).toPass({ timeout: 50000 });
         this.logoutFromGoogle = async () => {
             await this.page.goto(THIRD_PARTY_ROUTES.google.myAccount, {
                 timeout: 20000,
@@ -191564,16 +191584,16 @@ class GooglePage extends IntegrationBase {
                 .click({ timeout: 20000 });
         };
         this.handleNotVerifiedPage = async () => {
-            const continueUnsafeButton = this.page.getByRole("button", {
+            if (!this.page.url().includes(THIRD_PARTY_ROUTES.google.warningScreen))
+                return;
+            await this.page
+                .getByRole("button", {
                 name: GOOGLE_LOGIN_TEXTS.continue,
-            });
-            const backToSafety = this.page.getByRole("button", {
+            })
+                .click();
+            await test$1.expect(this.page.getByRole("button", {
                 name: GOOGLE_LOGIN_TEXTS.backToSafety,
-            });
-            if (this.page.url().includes(THIRD_PARTY_ROUTES.google.warningScreen)) {
-                await continueUnsafeButton.click();
-                await test$1.expect(backToSafety).toBeHidden({ timeout: 10000 });
-            }
+            })).toBeHidden({ timeout: 10000 });
         };
         this.totp = initializeTotp({
             issuer: "Google",
@@ -192864,13 +192884,13 @@ class TeamMembers {
         };
         this.addMemberViaUI = async ({ emails = [faker.faker.internet.exampleEmail()], role = "standard", } = {}) => {
             await this.page.getByTestId(MEMBER_SELECTORS.newButton).click();
+            await this.neetoPlaywrightUtilities.waitForPageLoad();
             await this.page
                 .getByTestId(MEMBER_FORM_SELECTORS.emailTextField)
                 .fill(emails.join(", "));
-            await test$1.expect(async () => {
-                await this.page.getByTestId(MEMBER_SELECTORS.roleLabel(role)).click();
-                await test$1.expect(this.page.getByTestId(MEMBER_SELECTORS.roleLabel(role))).toBeChecked();
-            }).toPass({ timeout: 20000 });
+            await this.neetoPlaywrightUtilities.toggleElement({
+                locator: this.page.getByTestId(MEMBER_SELECTORS.roleLabel(role)),
+            });
             await this.page.getByTestId(MEMBER_SELECTORS.continueButton).click();
             if (IS_STAGING_ENV) {
                 await this.page
@@ -192879,20 +192899,23 @@ class TeamMembers {
                     .click();
                 await this.page.getByTestId(MEMBER_SELECTORS.continueButton).click();
             }
+            await this.submit();
+            await this.neetoPlaywrightUtilities.waitForPageLoad();
+        };
+        this.submit = async () => {
             await test$1.expect(async () => {
-                const submitButton = this.page.getByTestId(MEMBER_SELECTORS.submitButton);
-                await submitButton.click();
-                await test$1.expect(submitButton.locator(COMMON_SELECTORS.buttonSpinner)).toBeHidden({
-                    timeout: 15000,
+                await this.neetoPlaywrightUtilities.clickButtonAndAwaitLoad({
+                    locator: this.page.getByTestId(MEMBER_SELECTORS.submitButton),
+                    timeout: 10000,
                 });
                 await test$1.expect(this.page.getByTestId(COMMON_SELECTORS.paneBody)).toBeHidden();
             }).toPass({ timeout: 40000 });
-            await this.neetoPlaywrightUtilities.waitForPageLoad();
             await this.neetoPlaywrightUtilities.verifyToast();
         };
         this.searchAndVerifyMemberByEmail = async ({ email, 
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         interceptOptions = {}, }) => {
+            await this.neetoPlaywrightUtilities.waitForPageLoad();
             await this.page.getByTestId(MEMBER_SELECTORS.searchTextField).fill(email);
             const emailSubstr = email.length > 20 ? email.substring(0, 20) : email;
             await test$1.expect(this.page.getByTestId(NEETO_FILTERS_SELECTORS.searchTermBlock)).toContainText(emailSubstr);
@@ -192903,6 +192926,7 @@ class TeamMembers {
         this.editMemberViaUI = async ({ email = "", firstName = "", lastName = "", role = "standard", } = {}) => {
             await this.page.getByTestId(MEMBER_SELECTORS.dropDownIcon).click();
             await this.page.getByTestId(MEMBER_SELECTORS.editButton).click();
+            await this.neetoPlaywrightUtilities.waitForPageLoad();
             neetoCist.isPresent(email) &&
                 (await this.page
                     .getByTestId(MEMBER_FORM_SELECTORS.emailInput)
@@ -192915,9 +192939,10 @@ class TeamMembers {
                 (await this.page
                     .getByTestId(MEMBER_FORM_SELECTORS.lastNameTextField)
                     .fill(lastName));
-            await this.page.getByTestId(MEMBER_SELECTORS.roleLabel(role)).click();
-            await this.page.getByTestId(MEMBER_SELECTORS.submitButton).click();
-            await this.neetoPlaywrightUtilities.verifyToast();
+            await this.neetoPlaywrightUtilities.toggleElement({
+                locator: this.page.getByTestId(MEMBER_SELECTORS.roleLabel(role)),
+            });
+            await this.submit();
             await this.neetoPlaywrightUtilities.waitForPageLoad();
         };
         this.removeMemberViaUI = async () => {
@@ -198817,6 +198842,7 @@ const definePlaywrightConfig = (overrides) => {
             testIdAttribute: "data-cy",
             trace: "on",
             screenshot: "on",
+            navigationTimeout: 35000,
             video: "on",
             actionTimeout: 10 * 1000,
             timezoneId: "Asia/Calcutta",