@bigbinary/neeto-playwright-commons 1.11.13 → 1.11.15

package/index.cjs.js

@@ -3599,23 +3599,23 @@ class CustomCommands {
                 })}`;
             return await this.request[method](formattedUrl, requestOptions);
         };
-        this.selectOptionFromDropdown = async ({ selectValueContainer, selectMenu, value, options = {}, }) => {
+        this.selectOptionFromDropdown = async ({ selectValueContainer = COMMON_SELECTORS.selectValueContainer, selectMenu = COMMON_SELECTORS.dropdownMenu, value, page = this.page, options = {}, }) => {
             Object.assign({
                 visibilityTimeout: 2000,
                 textAssertionTimeout: 1000,
                 retryTimeout: 20000,
             }, options);
             await test$1.expect(async () => {
-                await this.page.getByTestId(selectValueContainer).click();
-                await test$1.expect(this.page.getByTestId(selectMenu)).toBeVisible({
+                await page.getByTestId(selectValueContainer).click();
+                await test$1.expect(page.getByTestId(selectMenu)).toBeVisible({
                     timeout: options.visibilityTimeout,
                 });
-                await this.page.keyboard.type(value);
-                await this.page
+                await page.keyboard.type(value);
+                await page
                     .getByTestId(selectMenu)
                     .getByText(value, { exact: true })
                     .click();
-                await test$1.expect(this.page.getByTestId(selectValueContainer)).toContainText(value, { timeout: options.textAssertionTimeout });
+                await test$1.expect(page.getByTestId(selectValueContainer)).toContainText(value, { timeout: options.textAssertionTimeout });
             }).toPass({ timeout: options.retryTimeout });
         };
         this.verifyFieldValue = values => {
@@ -13131,7 +13131,7 @@ const GOOGLE_LOGIN_TEXTS = {
     googleAccount: "Google Account:",
     connectYourGoogleAccount: "Connect your Google account",
     signInWithGoogle: "Sign in with Google",
-    signInHeading: "Sign in to neetocal.net",
+    signInHeading: (appName) => `Sign in to ${appName}.net`,
     continue: "Continue",
     selectAll: "Select All",
     appNotVerified: "Google hasn’t verified this app",
@@ -13145,6 +13145,12 @@ const GOOGLE_LOGIN_TEXTS = {
     signOut: "Sign out",
     wrongCode: "Wrong code. Try again",
     verificationCode: "verification code",
+    confirm: "Confirm",
+    cancel: "Cancel",
+    deleteConnections: "Delete all connections you",
+    noLongerConnected: "You’re no longer connected to",
+    backToSafety: "Back to safety",
+    neetoAutomation: "neeto.automation",
 };
 
 const HELP_CENTER_SELECTORS = {
@@ -13420,14 +13426,6 @@ class HelpAndProfilePage {
     }
 }
 
-const INTEGRATION_SELECTORS = {
-    integrationCard: (integration) => `${integration}-integration-card`,
-    connectButton: "connect-button",
-    integrationStatusTag: "integration-status-tag",
-    disconnectButton: "disconnect-button",
-    manageButton: "manage-button",
-};
-
 const GOOGLE_LOGIN_SELECTORS = {
     totpNext: "#totpNext",
     form: "form",
@@ -15181,6 +15179,14 @@ const initializeTotp = ({ issuer, secret, }) => {
     });
 };
 
+const INTEGRATION_SELECTORS = {
+    integrationCard: (integration) => `${integration}-integration-card`,
+    connectButton: "connect-button",
+    integrationStatusTag: "integration-status-tag",
+    disconnectButton: "disconnect-button",
+    manageButton: "manage-button",
+};
+
 class IntegrationBase {
     constructor({ page, neetoPlaywrightUtilities, integration, connectHeader, connectedHeader, pageloaderTimeout, integrationRouteIndex, integrationRouteResponsesParams, }) {
         this.disconnect = async (interceptMultipleResponsesParams = {}) => {
@@ -15256,18 +15262,9 @@ class GooglePage extends IntegrationBase {
             integration,
             integrationRouteIndex,
         });
-        this.connectAndVerifyIntegration = async () => {
-            await this.connect();
-            await test$1.expect(this.page.getByRole("heading", {
-                name: GOOGLE_LOGIN_TEXTS.connectYourGoogleAccount,
-            })).toBeVisible({ timeout: 15000 });
-            await this.page
-                .getByRole("link", {
-                name: GOOGLE_LOGIN_TEXTS.signInWithGoogle,
-            })
-                .click();
+        this.connectGoogleAccount = async (appName) => {
             await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.chooseAccount));
-            await this.selectGoogleAccount();
+            await this.selectGoogleAccount(appName);
             if (process.env.TEST_ENV === ENVIRONMENT.staging) {
                 await this.stagingConsentFlow();
             }
@@ -15277,22 +15274,26 @@ class GooglePage extends IntegrationBase {
                     .getByRole("button", { name: GOOGLE_LOGIN_TEXTS.allow })
                     .click();
             }
-            await Promise.all([
-                test$1.expect(this.page.getByRole("heading", { name: this.connectedHeader })).toBeVisible({ timeout: 20000 }),
-                test$1.expect(this.page.getByTestId(INTEGRATION_SELECTORS.manageButton)).toBeVisible({ timeout: 20000 }),
-            ]);
         };
-        this.selectGoogleAccount = async () => {
-            await this.page.getByRole("link", { name: "neeto.automation" }).click();
-            try {
-                const verificationCode = this.page
-                    .locator(GOOGLE_LOGIN_SELECTORS.form)
-                    .getByText(GOOGLE_LOGIN_TEXTS.verificationCode);
-                await test$1.expect(verificationCode).toBeVisible({ timeout: 10000 });
+        this.selectGoogleAccount = async (appName) => {
+            const neetoAutomationLocator = this.page.getByRole("link", {
+                name: GOOGLE_LOGIN_TEXTS.neetoAutomation,
+            });
+            await neetoAutomationLocator.click();
+            await test$1.expect(neetoAutomationLocator).toBeHidden({ timeout: 10000 });
+            const verificationCode = this.page
+                .locator("form")
+                .getByText(GOOGLE_LOGIN_TEXTS.verificationCode);
+            if (this.page.url().includes(THIRD_PARTY_ROUTES.google.totpChallenge)) {
                 await this.enterTotpCode(verificationCode);
-                // eslint-disable-next-line no-empty
             }
-            catch (error) { }
+            await this.handleNotVerifiedPage();
+            await test$1.expect(this.page.getByRole("heading", {
+                name: GOOGLE_LOGIN_TEXTS.signInHeading(appName),
+            })).toBeVisible();
+            await this.page
+                .getByRole("button", { name: GOOGLE_LOGIN_TEXTS.continue })
+                .click();
         };
         this.loginToGoogle = async () => {
             await this.page.goto(THIRD_PARTY_ROUTES.google.signin);
@@ -15315,17 +15316,20 @@ class GooglePage extends IntegrationBase {
             await this.page
                 .getByRole("button", { name: GOOGLE_LOGIN_TEXTS.next })
                 .click();
-            await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.challengeSelection));
-            await this.page
-                .locator(GOOGLE_LOGIN_SELECTORS.totpChallengeSelector)
-                .click();
+            if (this.page.url().includes(THIRD_PARTY_ROUTES.google.challengeSelection)) {
+                await this.page
+                    .locator(GOOGLE_LOGIN_SELECTORS.totpChallengeSelector)
+                    .click();
+            }
             await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.totpChallenge));
-            const twoStepVerification = this.page
-                .locator(GOOGLE_LOGIN_SELECTORS.form)
-                .getByText(GOOGLE_LOGIN_TEXTS.twoStepVerification);
+            const twoStepVerification = this.page.locator("form").getByRole("heading", {
+                name: GOOGLE_LOGIN_TEXTS.twoStepVerification,
+                level: 2,
+                exact: true,
+            });
             await test$1.expect(twoStepVerification).toBeVisible();
             await this.enterTotpCode(twoStepVerification);
-            await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.myAccount));
+            await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.myAccount), { waitUntil: "load" });
         };
         this.enterTotpCode = async (locator) => {
             await test$1.expect(async () => {
@@ -15333,8 +15337,8 @@ class GooglePage extends IntegrationBase {
                 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();
-                await test$1.expect(locator).toBeHidden({ timeout: 20000 });
+                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 () => {
@@ -15349,28 +15353,39 @@ class GooglePage extends IntegrationBase {
             await this.disconnect();
             await this.verifyIntegrationStatus("disconnected");
         };
-        this.stagingConsentFlow = async () => {
-            await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.warningScreen));
-            await test$1.expect(this.page.getByRole("heading", {
-                name: GOOGLE_LOGIN_TEXTS.appNotVerified,
-            })).toBeVisible();
-            await this.page
-                .getByRole("button", { name: GOOGLE_LOGIN_TEXTS.continue })
-                .click();
-            await test$1.expect(this.page.getByRole("heading", {
-                name: GOOGLE_LOGIN_TEXTS.signInHeading,
-            })).toBeVisible();
-            await this.page
-                .getByRole("button", { name: GOOGLE_LOGIN_TEXTS.continue })
-                .click();
+        this.stagingConsentFlow = async ({ abortFlow = false, allowPermissions = true, } = {}) => {
+            await this.handleNotVerifiedPage();
+            if (this.page.url().includes(THIRD_PARTY_ROUTES.google.additionalInfoScreen)) {
+                await this.page
+                    .getByRole("button", { name: GOOGLE_LOGIN_TEXTS.continue })
+                    .click({ timeout: 20000 });
+            }
             await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.consentSummary));
+            if (abortFlow) {
+                await this.page
+                    .getByRole("button", { name: GOOGLE_LOGIN_TEXTS.cancel })
+                    .click({ timeout: 20000 });
+                return;
+            }
             const selectAllPermissions = this.page.getByLabel(GOOGLE_LOGIN_TEXTS.selectAll);
-            if (await selectAllPermissions.isVisible()) {
+            if (allowPermissions && (await selectAllPermissions.isVisible())) {
                 await selectAllPermissions.click();
             }
             await this.page
                 .getByRole("button", { name: GOOGLE_LOGIN_TEXTS.continue })
-                .click({ timeout: 15000 });
+                .click({ timeout: 20000 });
+        };
+        this.handleNotVerifiedPage = async () => {
+            const continueUnsafeButton = this.page.getByRole("button", {
+                name: GOOGLE_LOGIN_TEXTS.continue,
+            });
+            const backToSafety = 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 });
+            }
         };
         this.totp = initializeTotp({
             issuer: "Google",