@bigbinary/neeto-playwright-commons 4.1.8 → 4.1.9

package/index.d.ts

@@ -91,6 +91,10 @@ interface WaitForPageLoadParams {
   customPageContext: Page | undefined;
   waitForOption: "serial" | "parallel";
 }
+interface WaitForPaneToLoadParams {
+  visibilityTimeout: number;
+  customPageContext: Page;
+}
 type ApiRequest = (props: ApiRequestProps & Record<string, unknown>) => Promise<APIResponse | undefined>;
 interface FieldValue {
   field: string;
@@ -261,6 +265,22 @@ declare class CustomCommands {
     customPageContext,
     waitForOption
   }?: Partial<WaitForPageLoadParams>) => Promise<void>;
+  /**
+   *
+   * Command to wait until the pane body is visible and the pane has no spinners.
+   *
+   * @example 
+   *
+   *   await neetoPlaywrightUtilities.waitForPaneToLoad({
+   *     visibilityTimeout = 35_000,
+   *     customPageContext,
+   *   });
+   * @endexample
+  */
+  waitForPaneToLoad: ({
+    visibilityTimeout,
+    customPageContext
+  }?: Partial<WaitForPaneToLoadParams>) => Promise<void>;
   /**
    *
    * Command to send an API request.
@@ -3298,7 +3318,6 @@ declare class ZapierPage extends IntegrationBase {
    * @endexample
   */
   reconnectAccount: (zapierApiKey: string) => Promise<void>;
-  private setTextEditorValue;
   /**
    *
    * Logs into zapier web app. It takes the following parameters:
@@ -5958,7 +5977,7 @@ declare const ZAPIER_WEB_TEXTS: {
   password: string;
   editExistingDraft: string;
   signInTo: string;
-  yesContinueTo: string;
+  reconnectBtn: string;
   testTrigger: string;
   editStep: string;
   continueWithSelectedRecord: string;
@@ -7883,7 +7902,6 @@ declare const ZAPIER_SELECTORS: {
   zapAccountSubstep: string;
   zapOpenSubstepContainer: string;
   modal: string;
-  fmPrettytext: string;
   spinner: string;
   skeletonBlock: string;
   accountsLoader: string;
@@ -7904,7 +7922,6 @@ declare const ZAPIER_SELECTORS: {
   panelFooter: string;
   zapToggle: string;
   stepBlock: string;
-  fmPrettyBox: string;
   universalTopbar: string;
   accountsMenu: string;
   zapToggleCheckbox: string;

package/index.js

@@ -1796,7 +1796,6 @@ const ZAPIER_SELECTORS = {
     zapAccountSubstep: "[data-testid='substep-Account']",
     zapOpenSubstepContainer: "[data-testid='open-sub-step-container']",
     modal: "[data-testid='Modal']",
-    fmPrettytext: ".fm-prettytext",
     spinner: "spinner",
     skeletonBlock: "[data-testid='SkeletonBlock']",
     accountsLoader: "[data-testid='accounts-loader']",
@@ -1817,7 +1816,6 @@ const ZAPIER_SELECTORS = {
     panelFooter: "#details-panel-footer",
     zapToggle: "zap-toggle",
     stepBlock: `step-node-${process.env.ZAP_ID}`,
-    fmPrettyBox: ".fm-pretty-text-input.pretty-text-box",
     universalTopbar: "universalTopbar",
     accountsMenu: "accountsMenu",
     zapToggleCheckbox: "input[type='checkbox']",
@@ -2090,6 +2088,13 @@ class CustomCommands {
         }
         await Promise.all(loaders.map(loader => expect(loader).toHaveCount(0, { timeout: visibilityTimeout })));
     };
+    waitForPaneToLoad = async ({ visibilityTimeout = 35_000, customPageContext = this.page, } = {}) => {
+        const pane = customPageContext.getByTestId(COMMON_SELECTORS.paneBody);
+        await expect(pane).toBeVisible({ timeout: visibilityTimeout });
+        await expect(pane.getByTestId(COMMON_SELECTORS.uiSpinner)).toHaveCount(0, {
+            timeout: visibilityTimeout,
+        });
+    };
     apiRequest = async ({ url, failOnStatusCode = true, headers: additionalHeaders, body: data, method = "get", params = {}, timeout = 30_000, ...otherOptions }) => {
         const csrfToken = this.csrfToken ?? (await this.initializeCsrfToken());
         const requestOptions = {
@@ -2404,7 +2409,7 @@ const ZAPIER_WEB_TEXTS = {
     password: "Password",
     editExistingDraft: "Edit existing draft",
     signInTo: "Sign in to *",
-    yesContinueTo: "Yes, Continue to *",
+    reconnectBtn: "Reconnect",
     testTrigger: "Test trigger",
     editStep: "Edit step",
     continueWithSelectedRecord: "Continue with selected record",
@@ -2455,7 +2460,7 @@ const GOOGLE_LOGIN_TEXTS = {
     googleAccount: "Google Account:",
     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"),
+    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",
@@ -118733,6 +118738,7 @@ class HelpAndProfilePage {
                 expect(statusPage).toHaveURL(PROFILE_LINKS.neetoStatus),
                 expect(statusPage.getByRole("link", {
                     name: STATUS_TEXTS.appName(this.product),
+                    exact: true,
                 })).toBeVisible(),
             ]);
         });
@@ -119308,20 +119314,17 @@ class ZapierPage extends IntegrationBase {
         const reconnectPage = await reconnectPopup;
         await reconnectPage.waitForLoadState();
         await expect(reconnectPage.getByRole("heading", { name: ZAPIER_WEB_TEXTS.loading })).toBeHidden({ timeout: 15_000 });
-        const yesBtn = reconnectPage.getByRole("button", {
-            name: RegExp(ZAPIER_WEB_TEXTS.yesContinueTo),
+        const reconnectBtn = reconnectPage.getByRole("button", {
+            name: ZAPIER_WEB_TEXTS.reconnectBtn,
         });
-        const prettyTextBox = reconnectPage.locator(ZAPIER_SELECTORS.fmPrettytext);
-        const [subdomainBox, apiKeyBox] = [0, 1].map(index => 
-        // eslint-disable-next-line playwright/no-nth-methods
-        prettyTextBox.nth(index));
-        await expect(yesBtn).toBeVisible({ timeout: 25_000 });
-        const subdomain = getGlobalUserState()?.subdomainName;
-        await subdomainBox.click();
-        await this.setTextEditorValue(reconnectPage, subdomain);
-        await apiKeyBox.click();
-        await this.setTextEditorValue(reconnectPage, zapierApiKey, 1);
-        await yesBtn.click();
+        await expect(reconnectBtn).toBeVisible({ timeout: 25_000 });
+        await reconnectPage
+            .getByRole("textbox", { name: ZAPIER_WEB_TEXTS.subdomain })
+            .pressSequentially(getGlobalUserState()?.subdomainName);
+        await reconnectPage
+            .getByRole("textbox", { name: ZAPIER_WEB_TEXTS.apiKey })
+            .pressSequentially(zapierApiKey);
+        await reconnectBtn.click();
         const continueBtn = this.panelFooter.getByRole("button", {
             name: ZAPIER_WEB_TEXTS.continue,
             exact: true,
@@ -119338,14 +119341,6 @@ class ZapierPage extends IntegrationBase {
         })).toBeVisible({ timeout: 35_000 });
         await this.toggleZap();
     };
-    setTextEditorValue = (page, value, index = 0) => page.evaluate(({ selector, index, value }) => {
-        const container = document.querySelectorAll(selector)[index];
-        const cmElement = container.querySelector(".CodeMirror");
-        const cm = cmElement.CodeMirror;
-        cm.focus();
-        cm.setValue(value);
-        cm.refresh();
-    }, { selector: ZAPIER_SELECTORS.fmPrettyBox, index, value });
     loginToZapier = async (zapierWebPage) => {
         this.zapierWebPage = zapierWebPage;
         this.continueButton = this.zapierWebPage.getByRole("button", {
@@ -120532,7 +120527,7 @@ class TeamMembers {
             if (await pane.isHidden())
                 return;
             (await buttonSpinner.isHidden()) && (await submitBtn.click());
-            await expect(buttonSpinner).toBeHidden({ timeout: 10_000 });
+            await expect(buttonSpinner).toHaveCount(0, { timeout: 10_000 });
             await expect(pane).toBeHidden();
         }).toPass({ timeout: 60_000 });
         await this.neetoPlaywrightUtilities.verifyToast();
@@ -120549,7 +120544,10 @@ class TeamMembers {
     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();
+        await this.neetoPlaywrightUtilities.waitForPaneToLoad();
+        await expect(this.page
+            .getByTestId(MEMBER_SELECTORS.submitButton)
+            .getByTestId(COMMON_SELECTORS.uiSpinner)).toHaveCount(0, { timeout: 35_000 });
         isPresent(email) &&
             (await this.page
                 .getByTestId(MEMBER_FORM_SELECTORS.emailInput)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigbinary/neeto-playwright-commons",
-  "version": "4.1.8",
+  "version": "4.1.9",
   "description": "A package encapsulating common playwright code across neeto projects.",
   "repository": "git@github.com:bigbinary/neeto-playwright-commons.git",
   "license": "apache-2.0",