@bigbinary/neeto-playwright-commons 1.26.12 → 1.26.13

package/index.d.ts

@@ -2146,7 +2146,7 @@ declare class GooglePage extends IntegrationBase {
    * @endexample
   */
   loginToGoogle: () => Promise<void>;
-  enterTotpCode: (locator: Locator) => Promise<void>;
+  enterTotpCode: () => Promise<void>;
   /**
    *
    * Logs out of the Google account by navigating to the account settings and clicking the "Sign Out" button.

package/index.js

@@ -116427,11 +116427,8 @@ class GooglePage extends IntegrationBase {
                 .getByRole("link", { name: GOOGLE_LOGIN_TEXTS.neetoAutomation })
                 .click();
             await expect(chooseAnAccountHeading).toBeHidden({ timeout: 10000 });
-            const verificationCode = this.page
-                .locator("form")
-                .getByText(GOOGLE_LOGIN_TEXTS.verificationCode);
             this.page.url().includes(THIRD_PARTY_ROUTES.google.totpChallenge) &&
-                (await this.enterTotpCode(verificationCode));
+                (await this.enterTotpCode());
             await this.handleNotVerifiedPage();
             const signInHeading = this.page.getByRole("heading", {
                 name: GOOGLE_LOGIN_TEXTS.signInHeading(appName),
@@ -116470,32 +116467,29 @@ class GooglePage extends IntegrationBase {
                     .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,
-                level: 2,
-                exact: true,
-            });
-            await expect(twoStepVerification).toBeVisible({ timeout: 15000 });
-            await this.enterTotpCode(twoStepVerification);
+            await this.enterTotpCode();
             await this.page.waitForLoadState("load", { timeout: 25000 });
             await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.myAccount));
         };
-        this.enterTotpCode = async (locator) => {
+        this.enterTotpCode = async () => {
             let previousToken = null;
+            const codeInput = this.page.getByLabel(GOOGLE_LOGIN_TEXTS.enterCode);
+            await expect(codeInput).toBeVisible({ timeout: 20000 });
             await expect(async () => {
                 let totpToken = this.totp.generate({ timestamp: Date.now() });
                 if (totpToken === previousToken) {
                     const remainingTime = this.totp.remaining({ timestamp: Date.now() });
+                    // Wait for the remaining time plus a small buffer to ensure new token is generated
                     // 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
+                    await this.page.waitForTimeout(remainingTime + 500);
                     totpToken = this.totp.generate({ timestamp: Date.now() });
                 }
                 previousToken = totpToken;
-                await this.page.getByLabel(GOOGLE_LOGIN_TEXTS.enterCode).fill(totpToken);
+                await codeInput.fill(totpToken);
                 expect(this.totp.validate({ token: totpToken })).not.toBeNull();
                 await this.page.locator(GOOGLE_LOGIN_SELECTORS.totpNext).click();
                 await expect(this.page.getByText(GOOGLE_LOGIN_TEXTS.wrongCode)).toBeHidden({ timeout: 10000 });
-                await expect(locator).toBeHidden({ timeout: 10000 });
+                await expect(codeInput).toBeHidden({ timeout: 15000 });
             }).toPass({ timeout: 2 * 60 * 1000 });
         };
         this.logoutFromGoogle = async () => {