@bigbinary/neeto-playwright-commons 1.22.33 → 1.22.35

package/index.cjs.js

@@ -116,6 +116,7 @@ const THIRD_PARTY_ROUTES = {
         signin: "https://accounts.google.com/v3/signin/identifier?hl=en-gb&ifkv=ASKXGp0nW770RS7xin2puSwbGDpGCeaVKDtCgfpEU73fYmhMKbqUjukBQ5x8kdvEVxQ7OvcrnUo8sg&flowName=GlifWebSignIn&flowEntry=ServiceLogin&dsh=S688843923%3A1704795906762870&theme=glif",
         password: "https://accounts.google.com/v3/signin/challenge/pwd",
         totpChallenge: "https://accounts.google.com/v3/signin/challenge/totp",
+        connections: "https://myaccount.google.com/connections",
         challengeSelection: "https://accounts.google.com/v3/signin/challenge/selection",
         myAccount: "https://myaccount.google.com/",
         chooseAccount: "accounts.google.com/o/oauth2/auth/oauthchooseaccount",
@@ -189192,6 +189193,7 @@ const GOOGLE_LOGIN_TEXTS = {
     connectYourGoogleAccount: "Connect your Google account",
     signInWithGoogle: "Sign in with Google",
     signInHeading: (appName) => new RegExp(`(You’re signing back in to ${appName}\\.net|Sign in to ${appName}\\.net)`, "i"),
+    stagingAppName: (appName) => `${appName} - Staging`,
     continue: "Continue",
     selectAll: "Select All",
     appNotVerified: "Google hasn’t verified this app",
@@ -191468,7 +191470,7 @@ class IntegrationBase {
 }
 
 class GooglePage extends IntegrationBase {
-    constructor({ page, neetoPlaywrightUtilities, integration, integrationRouteIndex, }) {
+    constructor({ page, neetoPlaywrightUtilities, integration, integrationRouteIndex, appName, }) {
         var _a;
         super({
             page,
@@ -191480,7 +191482,7 @@ class GooglePage extends IntegrationBase {
             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) => {
+        this.connectGoogleAccount = async (appName = this.appName) => {
             await this.waitForGoogleAuthURL();
             await this.selectGoogleAccount(appName);
             await this.page.waitForLoadState("load", { timeout: 25000 });
@@ -191489,7 +191491,7 @@ class GooglePage extends IntegrationBase {
                 .getByRole("button", { name: GOOGLE_LOGIN_TEXTS.allow })
                 .click();
         };
-        this.selectGoogleAccount = async (appName) => {
+        this.selectGoogleAccount = async (appName = this.appName) => {
             const chooseAnAccountHeading = this.page.getByText(GOOGLE_LOGIN_TEXTS.chooseAnAccount, { exact: true });
             await test$1.expect(chooseAnAccountHeading).toBeVisible({ timeout: 10000 });
             await this.page
@@ -191605,11 +191607,28 @@ class GooglePage extends IntegrationBase {
                 name: GOOGLE_LOGIN_TEXTS.backToSafety,
             })).toBeHidden({ timeout: 10000 });
         };
+        this.revokePermissions = async () => {
+            const stagingAppName = GOOGLE_LOGIN_TEXTS.stagingAppName(this.appName);
+            await this.page.goto(THIRD_PARTY_ROUTES.google.connections);
+            await this.page.waitForLoadState("load", { timeout: 15000 });
+            const app = this.page.getByRole("link", { name: stagingAppName });
+            if (await app.isHidden())
+                return;
+            await app.click();
+            await this.page
+                .getByRole("button", { name: GOOGLE_LOGIN_TEXTS.deleteConnections })
+                .click();
+            await this.page
+                .getByRole("button", { name: GOOGLE_LOGIN_TEXTS.confirm })
+                .click();
+            await test$1.expect(this.page.getByText(GOOGLE_LOGIN_TEXTS.noLongerConnected)).toBeVisible();
+        };
+        this.t = playwrightI18nextFixture.getI18nInstance().t;
+        this.appName = appName !== null && appName !== void 0 ? appName : "";
         this.totp = initializeTotp({
             issuer: "Google",
             secret: (_a = process.env.GOOGLE_2FA_SECRET_KEY) !== null && _a !== void 0 ? _a : "",
         });
-        this.t = playwrightI18nextFixture.getI18nInstance().t;
     }
 }
 
@@ -192875,6 +192894,9 @@ class TeamMembers {
         this.addMemberViaUI = async ({ emails = [faker.faker.internet.exampleEmail()], role = "standard", } = {}) => {
             await this.page.getByTestId(MEMBER_SELECTORS.newButton).click();
             await this.neetoPlaywrightUtilities.waitForPageLoad();
+            const continueButton = this.page.getByTestId(MEMBER_SELECTORS.continueButton);
+            await test$1.expect(continueButton).toBeVisible();
+            await test$1.expect(continueButton.getByTestId(COMMON_SELECTORS.uiSpinner)).toBeHidden({ timeout: 35000 });
             await this.page
                 .getByTestId(MEMBER_FORM_SELECTORS.emailTextField)
                 .fill(emails.join(", "));
@@ -192882,7 +192904,7 @@ class TeamMembers {
             await this.neetoPlaywrightUtilities.toggleElement({
                 locator: this.page.getByTestId(MEMBER_SELECTORS.roleLabel(role)),
             });
-            await this.page.getByTestId(MEMBER_SELECTORS.continueButton).click();
+            await continueButton.click();
             if (IS_STAGING_ENV) {
                 await this.page
                     .getByTestId(COMMON_SELECTORS.paneBody)
@@ -193076,6 +193098,7 @@ neetoPlaywrightUtilities, loginPath = "/", }) => {
     if (shouldSkipSetupAndTeardown())
         return;
     await page.goto(loginPath, { timeout: 20000 });
+    await page.waitForLoadState("load", { timeout: 35000 });
     await page
         .getByTestId(LOGIN_SELECTORS.emailTextField)
         .fill(CREDENTIALS.email);
@@ -193108,9 +193131,7 @@ class OrganizationPage {
             return `https://${subdomainName}.${appName}.net`;
         };
         this.createOrganization = async ({ email, businessName, subdomainName, firstName, lastName, appName, }) => {
-            if (!IS_STAGING_ENV)
-                return;
-            if (shouldSkipSetupAndTeardown())
+            if (!IS_STAGING_ENV || shouldSkipSetupAndTeardown())
                 return;
             const defaultOtp = "123456";
             const appNameInLowerCase = appName.toLowerCase();
@@ -193118,6 +193139,7 @@ class OrganizationPage {
             isNeetoAuth
                 ? await this.page.goto(ROUTES.neetoAuthSignup, { timeout: 20000 })
                 : await this.page.goto(`${ROUTES.neetoAuthSignup}?redirect_uri=${appNameInLowerCase}.net/admin`, { timeout: 20000 });
+            await this.neetoPlaywrightUtilities.waitForPageLoad();
             const submitButton = this.page.getByTestId(SIGNUP_SELECTORS.submitButton);
             await this.page.getByTestId(SIGNUP_SELECTORS.emailTextField).fill(email);
             await submitButton.click();
@@ -193141,9 +193163,7 @@ class OrganizationPage {
             });
         };
         this.setupOrganization = async (product) => {
-            if (!IS_STAGING_ENV)
-                return;
-            if (shouldSkipSetupAndTeardown())
+            if (!IS_STAGING_ENV || shouldSkipSetupAndTeardown())
                 return;
             const { user } = readFileSyncIfExists();
             await this.createOrganization({