@bigbinary/neeto-playwright-commons 1.8.8 → 1.8.10

package/index.d.ts

@@ -43,12 +43,13 @@ declare class CustomCommands {
     page: Page;
     responses: string[];
     request: APIRequestContext;
-    constructor(page: Page, request: APIRequestContext);
+    baseURL: string | undefined;
+    constructor(page: Page, request: APIRequestContext, baseURL?: string | undefined);
     interceptMultipleResponses: ({ responseUrl, times, baseUrl, customPageContext, timeout, }?: Partial<InterceptMultipleResponsesParams>) => Promise<Response[]>;
     private recursiveMethod;
     executeRecursively: ExecuteRecursively;
     verifySuccessToast: ({ message, closeAfterVerification, }?: Partial<VerifySuccessToastParams>) => Promise<void>;
-    reloadAndWait: (requestCount: number, customPageContext?: Page) => Promise<void>;
+    reloadAndWait: (requestCount: number, customPageContext?: Page, interceptMultipleResponsesProps?: Partial<Omit<InterceptMultipleResponsesParams, "times">>) => Promise<void>;
     apiRequest: ApiRequest;
     verifyFieldValue: VerifyFieldValue;
 }

package/index.js

@@ -145,14 +145,14 @@ const COMMON_SELECTORS = {
     appSwitcherButton: "app-switcher-button",
     appSwitcherWrapper: "switcher-wrapper",
     tableSpinner: ".ant-spin",
-    pageLoader: "neeto-molecules-page-loader",
+    pageLoader: "neeto-molecules-pageloader",
     homeButton: "home-button",
     neetoUiSwitch: "nui-switch",
     floatingActionMenuButton: "floating-action-menu-container",
 };
 
 class CustomCommands {
-    constructor(page, request) {
+    constructor(page, request, baseURL = process.env.BASE_URL) {
         this.interceptMultipleResponses = ({ responseUrl = "", times = 1, baseUrl, customPageContext, timeout = 35000, } = {}) => {
             const pageContext = customPageContext !== null && customPageContext !== void 0 ? customPageContext : this.page;
             return Promise.all([...new Array(times)].map(() => pageContext.waitForResponse((response) => {
@@ -160,9 +160,7 @@ class CustomCommands {
                 if (response.request().resourceType() === "xhr" &&
                     response.status() === 200 &&
                     response.url().includes(responseUrl) &&
-                    response
-                        .url()
-                        .startsWith((_a = baseUrl !== null && baseUrl !== void 0 ? baseUrl : process.env.BASE_URL) !== null && _a !== void 0 ? _a : "") &&
+                    response.url().startsWith((_a = baseUrl !== null && baseUrl !== void 0 ? baseUrl : this.baseURL) !== null && _a !== void 0 ? _a : "") &&
                     !this.responses.includes((_b = response.headers()) === null || _b === void 0 ? void 0 : _b["x-request-id"])) {
                     this.responses.push((_c = response.headers()) === null || _c === void 0 ? void 0 : _c["x-request-id"]);
                     return true;
@@ -194,10 +192,11 @@ class CustomCommands {
                 (await this.page.getByTestId(COMMON_SELECTORS.toastCloseButton).click());
             await expect(this.page.locator(COMMON_SELECTORS.toastIcon)).toBeHidden();
         };
-        this.reloadAndWait = async (requestCount, customPageContext) => {
+        this.reloadAndWait = async (requestCount, customPageContext, interceptMultipleResponsesProps = {}) => {
             const pageContext = customPageContext !== null && customPageContext !== void 0 ? customPageContext : this.page;
             const reloadRequests = this.interceptMultipleResponses({
                 times: requestCount,
+                ...interceptMultipleResponsesProps,
             });
             await pageContext.reload();
             await reloadRequests;
@@ -235,6 +234,7 @@ class CustomCommands {
         this.page = page;
         this.responses = [];
         this.request = request;
+        this.baseURL = baseURL;
     }
 }
 
@@ -261,8 +261,8 @@ class MailosaurUtils {
 }
 
 const commands = {
-    neetoPlaywrightUtilities: async ({ page, request }, use) => {
-        const commands = new CustomCommands(page, request);
+    neetoPlaywrightUtilities: async ({ page, request, baseURL }, use) => {
+        const commands = new CustomCommands(page, request, baseURL);
         await use(commands);
     },
     mailosaur: async ({}, use) => {
@@ -289,11 +289,11 @@ const commands = {
 
 const generateStagingData = (product = "invoice") => {
     var _a;
-    const timestamp = `${dayjs().format("YYYYMMDDHH")}${(_a = process.env.JOB_COMPLETION_INDEX) !== null && _a !== void 0 ? _a : ""}`;
+    const timestamp = `${dayjs().format("MMDDHHmmssSSS")}${(_a = process.env.JOB_COMPLETION_INDEX) !== null && _a !== void 0 ? _a : ""}`;
     const firstName = "André";
     const lastName = "O'Reilly";
     const otpBypassKey = process.env.OTP_BYPASS_KEY;
-    const stagingOrganization = `cypresstest-${product}-${timestamp}`;
+    const stagingOrganization = `cpt-${product}-${timestamp}`;
     return {
         firstName,
         lastName,
@@ -305,7 +305,7 @@ const generateStagingData = (product = "invoice") => {
         businessName: stagingOrganization,
         subdomainName: IS_STAGING_ENV ? stagingOrganization : "spinkart",
         email: IS_STAGING_ENV
-            ? `cypresstest${otpBypassKey}+${product}+${timestamp}-playwright@bigbinary.com`
+            ? `cpt${otpBypassKey}+${product}+${timestamp}@bigbinary.com`
             : CREDENTIALS.email,
     };
 };
@@ -7430,7 +7430,7 @@ class HelpAndProfilePage {
                 .replaceAll(" ", "then")
                 .replaceAll("+", "");
             return osPlatform === "mac"
-                ? formattedShortcut.replace(/ctrl/g, "⌘")
+                ? formattedShortcut.replace(/ctrl/g, "⌘").replace(/alt/g, "opt")
                 : formattedShortcut;
         };
         this.openAndVerifyKeyboardShortcutsPane = async (productShortcuts, osPlatform = "windows") => {
@@ -7705,7 +7705,7 @@ const SIGNUP_SELECTORS = {
 };
 
 const extractSubdomainFromError = (errorString) => {
-    const regex = /cypresstest[a-zA-Z0-9-]+/g;
+    const regex = /cpt[a-zA-Z0-9-]+/g;
     const matches = errorString.match(regex);
     return matches[1];
 };