@bigbinary/neeto-playwright-commons 1.18.0 → 1.18.1

package/index.cjs.js

@@ -47,74 +47,6 @@ function _interopNamespaceDefault(e) {
 var fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs$d);
 var Path__namespace = /*#__PURE__*/_interopNamespaceDefault(Path);
 
-const BASE_URL = "/api/v1";
-const NEETO_AUTH_BASE_URL = (subdomain = "app") => `https://${subdomain}.neetoauth.net`;
-const ROUTES = {
-    neetoAuthSignup: `${NEETO_AUTH_BASE_URL()}/signups/new`,
-    neetoAuth: NEETO_AUTH_BASE_URL(),
-    loginLink: "/login",
-    profile: "/profile",
-    admin: "/admin",
-    myProfile: "/my/profile",
-    authSettings: "/settings",
-    webhooks: "/webhooks",
-    login: `${BASE_URL}/login`,
-    signup: `${BASE_URL}/signups`,
-    subdomainAvailability: `${BASE_URL}/subdomain_availability`,
-    countries: `${BASE_URL}/countries`,
-    neetoApps: `${BASE_URL}/neeto_apps`,
-    directUploads: "/direct_uploads",
-    teamMembers: {
-        all: "/team_members*/**",
-        bulkUpdate: "/team_members/teams/bulk_update",
-        index: "/team_members/teams",
-        show: (id) => `/team_members/teams/${id}`,
-    },
-    attachment: `/neeto_editor${BASE_URL}/direct_uploads/attach`,
-    dashboard: "/dashboard",
-    neetoThankYou: "/neeto_thank_you_engine",
-};
-const API_ROUTES = {
-    teamMembers: {
-        all: "/team_members*/**",
-        bulkUpdate: "/team_members/teams/bulk_update",
-        index: "/team_members/teams",
-        show: (id) => `/team_members/teams/${id}`,
-        creationStatus: (id) => `/team_members/teams/creation_status/${id}`,
-    },
-    integrations: {
-        zapier: {
-            api_keys: "/neeto_integrations/zapier/api_keys",
-        },
-    },
-};
-const THIRD_PARTY_ROUTES = {
-    webhooks: { site: "https://webhook.site/" },
-    slack: {
-        loginWithPassword: (workspace) => `https://${workspace}.slack.com/sign_in_with_password`,
-    },
-    zapier: {
-        login: "https://zapier.com/",
-        logOut: "https://zapier.com/logout",
-        zapEditor: (zapId) => `https://zapier.com/editor/${zapId}`,
-    },
-    google: {
-        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",
-        challengeSelection: "https://accounts.google.com/v3/signin/challenge/selection",
-        myAccount: "https://myaccount.google.com/",
-        chooseAccount: "accounts.google.com/o/oauth2/auth/oauthchooseaccount",
-        consentScreen: "accounts.google.com/signin/oauth/consent",
-        warningScreen: "accounts.google.com/signin/oauth/warning",
-        additionalInfoScreen: "accounts.google.com/signin/oauth/id",
-        consentSummary: "accounts.google.com/signin/oauth/v2/consentsummary",
-    },
-};
-const NEETO_ROUTES = {
-    imageUploader: "/neeto_image_uploader_engine",
-};
-
 const ENVIRONMENT = {
     development: "development",
     staging: "staging",
@@ -692,6 +624,7 @@ const CHAT_WIDGET_SELECTORS = {
     chatBubble: "neeto-chat-widget-chat-message-bubble",
     closeChat: "neeto-chat-widget-close-btn",
     chatQuestionHeader: "chat-question-header",
+    openChat: "neeto-chat-widget-open-btn",
 };
 const CHANGELOG_WIDGET_SELECTORS = {
     changelogWrapper: ".ne-widget__wrapper",
@@ -3943,34 +3876,30 @@ class CustomCommands {
         };
         this.verifyToast = async ({ message = "", toastType = "success", closeAfterVerification = true, timeout = 10000, customPageContext = this.page, } = {}) => {
             const toastrCloseButton = customPageContext.getByTestId(COMMON_SELECTORS.toastCloseButton);
-            if (!ramda.isEmpty(message)) {
-                await test$1.expect(customPageContext.getByTestId(COMMON_SELECTORS.toastMessage(toastType))).toContainText(message, { timeout });
-            }
-            else {
-                await test$1.expect(customPageContext.locator(COMMON_SELECTORS.toastIcon)).toContainText("👍", { timeout });
-            }
-            if (closeAfterVerification && (await toastrCloseButton.isVisible())) {
-                const buttonHandle = await toastrCloseButton.elementHandle();
-                if (buttonHandle) {
-                    await customPageContext.evaluate(button => {
-                        button.dispatchEvent(new Event("click", { bubbles: true }));
-                    }, buttonHandle);
-                    // eslint-disable-next-line playwright/no-standalone-expect
-                    await test$1.expect(toastrCloseButton).toBeHidden();
-                }
+            const toastrLocator = ramda.isEmpty(message)
+                ? customPageContext.locator(COMMON_SELECTORS.toastIcon)
+                : customPageContext.getByTestId(COMMON_SELECTORS.toastMessage(toastType));
+            await test$1.expect(toastrLocator).toContainText(ramda.isEmpty(message) ? "👍" : message, {
+                timeout,
+            });
+            if (!closeAfterVerification && (await toastrCloseButton.isHidden()))
+                return;
+            const buttonHandle = await toastrCloseButton.elementHandle();
+            if (buttonHandle) {
+                await customPageContext.evaluate(button => {
+                    button.dispatchEvent(new Event("click", { bubbles: true }));
+                }, buttonHandle);
+                // eslint-disable-next-line playwright/no-standalone-expect
+                await test$1.expect(toastrCloseButton).toBeHidden();
             }
         };
-        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 Promise.all([
-                this.waitForPageLoad({ customPageContext: pageContext }),
-                reloadRequests,
-            ]);
+        this.reloadAndWait = async (
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        requestCount, customPageContext = this.page, 
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        interceptMultipleResponsesProps = {}) => {
+            await customPageContext.reload();
+            await this.waitForPageLoad({ customPageContext });
         };
         this.waitForPageLoad = async ({ visibilityTimeout = 35000, customPageContext, } = {}) => {
             const pageContext = customPageContext !== null && customPageContext !== void 0 ? customPageContext : this.page;
@@ -4049,13 +3978,9 @@ class CustomCommands {
             await this.page
                 .getByTestId(NEETO_IMAGE_UPLOADER_SELECTORS.browseText)
                 .click();
-            const uploadFile = this.interceptMultipleResponses({
-                responseUrl: ROUTES.directUploads,
-            });
             await this.page
                 .getByTestId(NEETO_IMAGE_UPLOADER_SELECTORS.fileInput)
                 .setInputFiles(imagePath);
-            await uploadFile;
             await test$1.expect(this.page.getByTestId(NEETO_IMAGE_UPLOADER_SELECTORS.uploadedImage)).toHaveAttribute("src", new RegExp(imageName), { timeout: 20000 });
         };
         this.uploadFileViaDispatch = async ({ fileNameWithType, assetsPath = "../../../e2e/assets/", dispatchEvent = "drop", droppableZone = this.page.getByTestId(COMMON_SELECTORS.fileUploadBody), }) => {
@@ -21335,11 +21260,8 @@ class ThankYouPage {
     constructor(page, neetoPlaywrightUtilities) {
         this.navigateToThankYouPage = async () => {
             await this.page.getByTestId(TAB_SELECTORS.settingsTab).click();
-            const fetchConfiguration = this.neetoPlaywrightUtilities.interceptMultipleResponses({
-                responseUrl: ROUTES.neetoThankYou,
-            });
             await this.page.getByTestId(THANK_YOU_SELECTORS.settingsLink).click();
-            await fetchConfiguration;
+            await this.neetoPlaywrightUtilities.waitForPageLoad();
         };
         this.saveChanges = async () => {
             await this.page.getByTestId(THANK_YOU_SELECTORS.saveChangesButton).click();
@@ -21571,6 +21493,74 @@ class EmbedBase {
     }
 }
 
+const BASE_URL = "/api/v1";
+const NEETO_AUTH_BASE_URL = (subdomain = "app") => `https://${subdomain}.neetoauth.net`;
+const ROUTES = {
+    neetoAuthSignup: `${NEETO_AUTH_BASE_URL()}/signups/new`,
+    neetoAuth: NEETO_AUTH_BASE_URL(),
+    loginLink: "/login",
+    profile: "/profile",
+    admin: "/admin",
+    myProfile: "/my/profile",
+    authSettings: "/settings",
+    webhooks: "/webhooks",
+    login: `${BASE_URL}/login`,
+    signup: `${BASE_URL}/signups`,
+    subdomainAvailability: `${BASE_URL}/subdomain_availability`,
+    countries: `${BASE_URL}/countries`,
+    neetoApps: `${BASE_URL}/neeto_apps`,
+    directUploads: "/direct_uploads",
+    teamMembers: {
+        all: "/team_members*/**",
+        bulkUpdate: "/team_members/teams/bulk_update",
+        index: "/team_members/teams",
+        show: (id) => `/team_members/teams/${id}`,
+    },
+    attachment: `/neeto_editor${BASE_URL}/direct_uploads/attach`,
+    dashboard: "/dashboard",
+    neetoThankYou: "/neeto_thank_you_engine",
+};
+const API_ROUTES = {
+    teamMembers: {
+        all: "/team_members*/**",
+        bulkUpdate: "/team_members/teams/bulk_update",
+        index: "/team_members/teams",
+        show: (id) => `/team_members/teams/${id}`,
+        creationStatus: (id) => `/team_members/teams/creation_status/${id}`,
+    },
+    integrations: {
+        zapier: {
+            api_keys: "/neeto_integrations/zapier/api_keys",
+        },
+    },
+};
+const THIRD_PARTY_ROUTES = {
+    webhooks: { site: "https://webhook.site/" },
+    slack: {
+        loginWithPassword: (workspace) => `https://${workspace}.slack.com/sign_in_with_password`,
+    },
+    zapier: {
+        login: "https://zapier.com/",
+        logOut: "https://zapier.com/logout",
+        zapEditor: (zapId) => `https://zapier.com/editor/${zapId}`,
+    },
+    google: {
+        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",
+        challengeSelection: "https://accounts.google.com/v3/signin/challenge/selection",
+        myAccount: "https://myaccount.google.com/",
+        chooseAccount: "accounts.google.com/o/oauth2/auth/oauthchooseaccount",
+        consentScreen: "accounts.google.com/signin/oauth/consent",
+        warningScreen: "accounts.google.com/signin/oauth/warning",
+        additionalInfoScreen: "accounts.google.com/signin/oauth/id",
+        consentSummary: "accounts.google.com/signin/oauth/v2/consentsummary",
+    },
+};
+const NEETO_ROUTES = {
+    imageUploader: "/neeto_image_uploader_engine",
+};
+
 const CHAT_WIDGET_TEXTS = {
     newConversation: "Ask a question",
     welcomeChatBubble: "Hi! I'm here to assist you with any questions you may have. What can I do for you?",
@@ -21666,6 +21656,9 @@ const COMMON_TEXTS = {
     skipCleanup: "SKIP_CLEANUP",
     skipSetup: "SKIP_SETUP",
 };
+const ORGANIZATION_TEXTS = {
+    subdomainAvailable: "Subdomain is available",
+};
 
 /* eslint-disable playwright/require-top-level-describe */
 /* eslint-disable playwright/no-standalone-expect */
@@ -21695,12 +21688,8 @@ class HelpAndProfilePage {
             }).toPass({ timeout: 35000 + widgetVisibilityTimeout * 2 });
         };
         this.openAndVerifyChatWidgetV2 = async () => {
-            const chatInitializationApis = this.neetoPlaywrightUtilities.interceptMultipleResponses({
-                baseUrl: this.chatApiBaseURL,
-                times: 3,
-            });
             await this.page.reload();
-            await chatInitializationApis;
+            await this.neetoPlaywrightUtilities.waitForPageLoad();
             await test$1.test.step("Step 1: Open live chat and verify iframe", this.openLiveChatAndVerify);
             await test$1.test.step("Step 2: Close and reopen live chat frame", async () => {
                 await this.page.getByTestId(CHAT_WIDGET_SELECTORS.closeChat).click();
@@ -23699,12 +23688,8 @@ class IntegrationBase {
         };
         this.gotoIntegrationIndex = async () => {
             if (neetoCist.isNotEmpty(this.integrationRouteIndex)) {
-                const integrationIndexPromise = this.neetoPlaywrightUtilities.interceptMultipleResponses({
-                    times: 0,
-                    ...this.integrationRouteResponsesParams,
-                });
                 await this.page.goto(this.integrationRouteIndex, { timeout: 20000 });
-                await integrationIndexPromise;
+                await this.neetoPlaywrightUtilities.waitForPageLoad();
             }
         };
         this.page = page;
@@ -23739,13 +23724,12 @@ class GooglePage extends IntegrationBase {
             await this.selectGoogleAccount(appName);
             if (process.env.TEST_ENV === ENVIRONMENT.staging) {
                 await this.stagingConsentFlow();
+                return;
             }
-            else {
-                await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.consentScreen));
-                await this.page
-                    .getByRole("button", { name: GOOGLE_LOGIN_TEXTS.allow })
-                    .click();
-            }
+            await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.consentScreen));
+            await this.page
+                .getByRole("button", { name: GOOGLE_LOGIN_TEXTS.allow })
+                .click();
         };
         this.selectGoogleAccount = async (appName) => {
             const neetoAutomationLocator = this.page.getByRole("link", {
@@ -23756,16 +23740,17 @@ class GooglePage extends IntegrationBase {
             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);
-            }
+            this.page.url().includes(THIRD_PARTY_ROUTES.google.totpChallenge) &&
+                (await this.enterTotpCode(verificationCode));
             await this.handleNotVerifiedPage();
-            await test$1.expect(this.page.getByRole("heading", {
+            const signInHeading = this.page.getByRole("heading", {
                 name: GOOGLE_LOGIN_TEXTS.signInHeading(appName),
-            })).toBeVisible();
+            });
+            await test$1.expect(signInHeading).toBeVisible();
             await this.page
                 .getByRole("button", { name: GOOGLE_LOGIN_TEXTS.continue })
                 .click();
+            await test$1.expect(signInHeading).toBeHidden({ timeout: 10000 });
         };
         this.loginToGoogle = async () => {
             await this.page.goto(THIRD_PARTY_ROUTES.google.signin, { timeout: 20000 });
@@ -23788,11 +23773,10 @@ class GooglePage extends IntegrationBase {
             await this.page
                 .getByRole("button", { name: GOOGLE_LOGIN_TEXTS.next })
                 .click();
-            if (this.page.url().includes(THIRD_PARTY_ROUTES.google.challengeSelection)) {
-                await this.page
+            this.page.url().includes(THIRD_PARTY_ROUTES.google.challengeSelection) &&
+                (await this.page
                     .locator(GOOGLE_LOGIN_SELECTORS.totpChallengeSelector)
-                    .click();
-            }
+                    .click());
             await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.totpChallenge));
             const twoStepVerification = this.page.locator("form").getByRole("heading", {
                 name: GOOGLE_LOGIN_TEXTS.twoStepVerification,
@@ -23829,11 +23813,10 @@ class GooglePage extends IntegrationBase {
         };
         this.stagingConsentFlow = async ({ abortFlow = false, allowPermissions = true, } = {}) => {
             await this.handleNotVerifiedPage();
-            if (this.page.url().includes(THIRD_PARTY_ROUTES.google.additionalInfoScreen)) {
-                await this.page
+            this.page.url().includes(THIRD_PARTY_ROUTES.google.additionalInfoScreen) &&
+                (await this.page
                     .getByRole("button", { name: GOOGLE_LOGIN_TEXTS.continue })
-                    .click({ timeout: 20000 });
-            }
+                    .click({ timeout: 20000 }));
             await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.consentSummary));
             if (abortFlow) {
                 await this.page
@@ -23939,39 +23922,33 @@ class SlackPage extends IntegrationBase {
             await this.disconnect();
             await this.verifyIntegrationStatus("disconnected");
         };
-        this.updateConfigureSlackChannel = async ({ newSlackChannel = "random", interceptMultipleResponsesParams = {}, refreshInterceptMultipleResponsesParams = {}, refreshChannelList = false, }) => {
+        this.updateConfigureSlackChannel = async ({ newSlackChannel = "random", 
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        interceptMultipleResponsesParams = {}, 
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        refreshInterceptMultipleResponsesParams = {}, refreshChannelList = false, }) => {
             await this.page.getByTestId(INTEGRATION_SELECTORS.manageButton).click();
             await this.page
                 .getByRole("button", { name: this.t("neetoSlack.common.edit") })
                 .click();
-            if (refreshChannelList) {
-                await this.clickOnChannelListRefreshButton(refreshInterceptMultipleResponsesParams);
-            }
+            refreshChannelList && (await this.clickOnChannelListRefreshButton());
             await this.page.getByTestId(COMMON_SELECTORS.selectContainer).click();
             await this.page
                 .getByTestId(COMMON_SELECTORS.dropdownMenu)
                 .getByText(newSlackChannel)
                 .click();
-            const savePromise = this.neetoPlaywrightUtilities.interceptMultipleResponses({
-                times: 0,
-                ...interceptMultipleResponsesParams,
-            });
-            await this.page
-                .getByRole("button", { name: this.t("neetoSlack.common.save") })
-                .click();
-            await savePromise;
+            await this.neetoPlaywrightUtilities.saveChanges();
         };
-        this.clickOnChannelListRefreshButton = async (refreshInterceptMultipleResponsesParams) => {
-            const refreshChannelPromise = this.neetoPlaywrightUtilities.interceptMultipleResponses({
-                times: 0,
-                ...refreshInterceptMultipleResponsesParams,
-            });
+        this.clickOnChannelListRefreshButton = async () => {
+            //Use getByTestId when this issue https://github.com/bigbinary/neeto-slack-nano/issues/438 is resolved
             await this.page
                 .getByRole("button", {
                 name: this.t("neetoSlack.slack.channelListRefreshButton"),
             })
                 .click();
-            await refreshChannelPromise;
+            await this.neetoPlaywrightUtilities.verifyToast({
+                message: this.t("neetoSlack.slack.channelListRefreshToastr"),
+            });
         };
         this.loginToSlackWebapp = async (slackWebappPage, customCredentials) => {
             this.slackWebappPage = slackWebappPage;
@@ -23994,10 +23971,9 @@ class SlackPage extends IntegrationBase {
                     .locator(SLACK_SELECTORS.redirectOpenInBrowser)
                     .click();
                 await this.setupCloseHandlers(slackWebappPage);
+                return;
             }
-            else {
-                throw new Error("ENV variable SLACK_LOGIN_EMAIL or SLACK_LOGIN_PASSWORD or SLACK_WORKSPACE is not defined.");
-            }
+            throw new Error("ENV variable SLACK_LOGIN_EMAIL or SLACK_LOGIN_PASSWORD or SLACK_WORKSPACE is not defined.");
         };
         this.logoutFromSlackWebApp = async () => {
             await this.slackWebappPage
@@ -24641,9 +24617,6 @@ class EditorPage {
             const fileUploader = await fileUploaderPromise;
             const imagePath = Path__namespace.join(__dirname, filePath);
             await fileUploader.setFiles(imagePath);
-            await this.neetoPlaywrightUtilities.interceptMultipleResponses({
-                responseUrl: ROUTES.attachment,
-            });
             await test$1.expect(this.attachmentPreview).toBeVisible();
             if (shouldRemoveAttachment) {
                 await this.attachmentPreview
@@ -24858,13 +24831,9 @@ class EditorPage {
 class ImageUploader {
     constructor(page, neetoPlaywrightUtilities) {
         this.submitCroppedImage = async () => {
-            const cropImage = this.neetoPlaywrightUtilities.interceptMultipleResponses({
-                responseUrl: ROUTES.directUploads,
-            });
             await this.page
                 .getByTestId(NEETO_IMAGE_UPLOADER_SELECTORS.cropSubmitButton)
                 .click();
-            await cropImage;
         };
         this.removeImage = async () => {
             await this.page
@@ -24928,13 +24897,9 @@ class ImageUploader {
         };
         this.selectImageFromWeb = async ({ nthImage = 0, searchTerm = "", toggleOrginalImage = false, toggleAspectRatioLock = false, aspectRatioHeight = "9", aspectRatioWidth = "16", width = "100", height = "100", } = {}) => {
             await this.openImageLibrary();
-            const switchImageTab = this.neetoPlaywrightUtilities.interceptMultipleResponses({
-                responseUrl: NEETO_ROUTES.imageUploader,
-            });
             await this.page
                 .getByTestId(NEETO_IMAGE_UPLOADER_SELECTORS.unsplashTab)
                 .click();
-            await switchImageTab;
             if (neetoCist.isNotEmpty(searchTerm)) {
                 await this.page
                     .getByTestId(NEETO_IMAGE_UPLOADER_SELECTORS.unsplashSearchInput)
@@ -25033,17 +24998,15 @@ class TeamMembers {
             await this.neetoPlaywrightUtilities.waitForPageLoad();
             await this.neetoPlaywrightUtilities.verifyToast();
         };
-        this.searchAndVerifyMemberByEmail = async ({ email, interceptOptions = {}, }) => {
-            const searchMembers = this.neetoPlaywrightUtilities.interceptMultipleResponses({
-                responseUrl: API_ROUTES.teamMembers.index,
-                ...interceptOptions,
-            });
+        this.searchAndVerifyMemberByEmail = async ({ email, 
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        interceptOptions = {}, }) => {
             await this.page.getByTestId(MEMBER_SELECTORS.searchTextField).fill(email);
-            await searchMembers;
             const emailSubstr = email.length > 20 ? email.substring(0, 20) : email;
             await test$1.expect(this.page.getByTestId(NEETO_FILTERS_SELECTORS.searchTermBlock)).toContainText(emailSubstr);
+            await this.neetoPlaywrightUtilities.waitForPageLoad();
+            await test$1.expect(this.page.locator(COMMON_SELECTORS.tableSpinner)).toBeHidden();
             await test$1.expect(this.page.getByRole("cell", { name: email, exact: true })).toBeVisible();
-            await test$1.expect(this.page.getByTestId(COMMON_SELECTORS.tableSpinner)).toBeHidden();
         };
         this.editMemberViaUI = async ({ email = "", firstName = "", lastName = "", role = "standard", } = {}) => {
             await this.page.getByTestId(MEMBER_SELECTORS.dropDownIcon).click();
@@ -25080,13 +25043,9 @@ class TeamMembers {
                 .getByTestId(COMMON_SELECTORS.actionSelectIndicator)
                 .click();
             for (const option of selectedOptions) {
-                const fetchMembers = this.neetoPlaywrightUtilities.interceptMultipleResponses({
-                    responseUrl: API_ROUTES.teamMembers.index,
-                });
                 await this.page
                     .getByTestId(COMMON_SELECTORS.selectOption(option))
                     .click();
-                await fetchMembers;
             }
         };
         this.filterMembers = async ({ email = { id: "", condition: "Is" }, roles = [], name = "", }) => {
@@ -25099,23 +25058,14 @@ class TeamMembers {
                 await this.page
                     .getByTestId(COMMON_SELECTORS.selectOption(email.condition))
                     .click();
-                const fetchMembers = this.neetoPlaywrightUtilities.interceptMultipleResponses({
-                    responseUrl: API_ROUTES.teamMembers.index,
-                });
                 await this.page
                     .getByTestId(NEETO_FILTERS_SELECTORS.filtersEmailFilter)
                     .fill(email.id);
-                await fetchMembers;
             }
-            if (neetoCist.isPresent(name)) {
-                const fetchMembers = this.neetoPlaywrightUtilities.interceptMultipleResponses({
-                    responseUrl: API_ROUTES.teamMembers.index,
-                });
-                await this.page
+            neetoCist.isPresent(name) &&
+                (await this.page
                     .getByTestId(NEETO_FILTERS_SELECTORS.neetoFiltersNameFilterField)
-                    .fill(name);
-                await fetchMembers;
-            }
+                    .fill(name));
             neetoCist.isPresent(roles) &&
                 (await this.filterMembersByMultiSelect({ selectedOptions: roles }));
             await this.page
@@ -25163,7 +25113,8 @@ class TeamMembers {
                 .getByTestId(TABLE_SELECTORS.columnMenuButton)
                 .click();
             await this.page.getByRole("button", { name: actionButtonText }).click();
-            await test$1.expect(this.page.getByTestId(COMMON_SELECTORS.tableSpinner)).toBeHidden();
+            await this.neetoPlaywrightUtilities.waitForPageLoad();
+            await test$1.expect(this.page.locator(COMMON_SELECTORS.tableSpinner)).toBeHidden();
         };
         this.toggleMemberColumns = async ({ columns = [], bulkAction, }) => {
             await this.page.getByTestId(COMMON_SELECTORS.columnsDropdownButton).click();
@@ -25196,7 +25147,9 @@ class TeamMembers {
     }
 }
 
-const loginWithoutSSO = async ({ page, neetoPlaywrightUtilities, loginPath = "/", }) => {
+const loginWithoutSSO = async ({ page, 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+neetoPlaywrightUtilities, loginPath = "/", }) => {
     if (shouldSkipSetupAndTeardown())
         return;
     await page.goto(loginPath, { timeout: 20000 });
@@ -25206,11 +25159,9 @@ const loginWithoutSSO = async ({ page, neetoPlaywrightUtilities, loginPath = "/"
     await page
         .getByTestId(LOGIN_SELECTORS.passwordTextField)
         .fill(CREDENTIALS.password);
-    const login = neetoPlaywrightUtilities.interceptMultipleResponses({
-        times: 1,
-    });
-    await page.getByTestId(LOGIN_SELECTORS.submitButton).click();
-    await login;
+    const submitButton = page.getByTestId(LOGIN_SELECTORS.submitButton);
+    await submitButton.click();
+    await test$1.expect(submitButton).toBeHidden({ timeout: 15000 });
     const userCredentials = readFileSyncIfExists();
     await page.context().storageState({ path: STORAGE_STATE });
     const mergedCredentials = ramda.mergeAll([readFileSyncIfExists(), userCredentials]);
@@ -25244,14 +25195,11 @@ class OrganizationPage {
             isNeetoAuth
                 ? await this.page.goto(ROUTES.neetoAuthSignup, { timeout: 20000 })
                 : await this.page.goto(`${ROUTES.neetoAuthSignup}?redirect_uri=${appNameInLowerCase}.net/admin`, { timeout: 20000 });
+            const submitButton = this.page.getByTestId(SIGNUP_SELECTORS.submitButton);
             await this.page.getByTestId(SIGNUP_SELECTORS.emailTextField).fill(email);
-            const signup = this.neetoPlaywrightUtilities.interceptMultipleResponses({
-                responseUrl: ROUTES.signup,
-                timeout: 60 * 1000,
-                baseUrl: NEETO_AUTH_BASE_URL(),
-            });
-            await this.page.getByTestId(SIGNUP_SELECTORS.submitButton).click();
-            await signup;
+            await submitButton.click();
+            await test$1.expect(submitButton).toBeHidden({ timeout: 30000 });
+            await this.neetoPlaywrightUtilities.waitForPageLoad();
             await this.page.getByTestId(SIGNUP_SELECTORS.otpTextBox).fill(defaultOtp);
             await this.fillOrganizationDetails({
                 credentials: {
@@ -25303,15 +25251,9 @@ class OrganizationPage {
             if (subdomainErrorCount !== 0) {
                 const subdomainErrorText = await subdomainError.innerText();
                 const newOrganizationName = extractSubdomainFromError(subdomainErrorText);
-                const subdomainAvailability = this.neetoPlaywrightUtilities.interceptMultipleResponses({
-                    responseUrl: ROUTES.subdomainAvailability,
-                    timeout: 60 * 1000,
-                    baseUrl: NEETO_AUTH_BASE_URL(),
-                });
                 await this.page
                     .getByTestId(SIGNUP_SELECTORS.subdomainNameTextField)
                     .fill(newOrganizationName);
-                await subdomainAvailability;
                 subdomainErrorCount = await subdomainError.count();
                 if (subdomainErrorCount === 0) {
                     updateCredentials({
@@ -25354,15 +25296,10 @@ class OrganizationPage {
                 .fill(lastName);
             country && (await this.changeCountry(country));
             await this.page.getByTestId(COMMON_SELECTORS.checkbox).click();
-            const submitProfile = this.neetoPlaywrightUtilities.interceptMultipleResponses({
-                customPageContext: this.page,
-                responseUrl: ROUTES.signup,
-                baseUrl: NEETO_AUTH_BASE_URL(),
-                timeout: 60000,
-            });
-            await this.page.getByTestId(SIGNUP_SELECTORS.profileSubmitButton).click();
-            await submitProfile;
-            await test$1.expect(this.page.getByTestId(COMMON_SELECTORS.pageLoader)).toBeHidden({ timeout: 15000 });
+            const profileSubmitButton = this.page.getByTestId(SIGNUP_SELECTORS.profileSubmitButton);
+            await profileSubmitButton.click();
+            await test$1.expect(profileSubmitButton).toBeHidden({ timeout: 45000 });
+            await this.neetoPlaywrightUtilities.waitForPageLoad();
         };
         this.loginAndOnboard = async ({ email, firstName, lastName, country, handleOnboarding, baseURL = process.env.BASE_URL, }) => {
             await this.page.goto(`${baseURL}${ROUTES.admin}`, { timeout: 20000 });
@@ -25379,13 +25316,9 @@ class OrganizationPage {
             await this.page
                 .getByTestId(SIGNUP_SELECTORS.emailTextField)
                 .fill(credentials.email);
-            const signup = this.neetoPlaywrightUtilities.interceptMultipleResponses({
-                responseUrl: ROUTES.signup,
-                timeout: 60 * 1000,
-                baseUrl: NEETO_AUTH_BASE_URL(),
-            });
-            await this.page.getByTestId(SIGNUP_SELECTORS.submitButton).click();
-            await signup;
+            const submitButton = this.page.getByTestId(SIGNUP_SELECTORS.submitButton);
+            await submitButton.click();
+            await test$1.expect(submitButton).toBeHidden({ timeout: 10000 });
             if (fetchOtpFromEmail !== undefined) {
                 otp = await fetchOtpFromEmail({
                     email: credentials.email,
@@ -25402,35 +25335,27 @@ class OrganizationPage {
             return { STORAGE_STATE, baseURL: process.env.BASE_URL };
         };
         this.fillOrganizationDetails = async ({ credentials, appName, }) => {
+            const subdomainError = this.page.getByTestId(SIGNUP_SELECTORS.subdomainError);
+            const organizationSubmitButton = this.page.getByTestId(SIGNUP_SELECTORS.organizationSubmitButton);
             await this.page
                 .getByTestId(SIGNUP_SELECTORS.organizationNameTextField)
                 .fill(neetoCist.humanize(credentials.businessName));
-            const fetchSubdomainAvailability = this.neetoPlaywrightUtilities.interceptMultipleResponses({
-                responseUrl: ROUTES.subdomainAvailability,
-                timeout: 60 * 1000,
-                baseUrl: NEETO_AUTH_BASE_URL(),
-            });
             await this.page
                 .getByTestId(SIGNUP_SELECTORS.subdomainNameTextField)
                 .fill(credentials.subdomainName);
-            await fetchSubdomainAvailability;
-            const subdomainError = this.page.getByTestId(SIGNUP_SELECTORS.subdomainError);
             const subdomainErrorCount = await subdomainError.count();
-            if (subdomainErrorCount !== 0) {
-                await this.updateSubdomainIfExists(appName);
-            }
-            const fetchProfile = this.neetoPlaywrightUtilities.interceptMultipleResponses({
-                times: 2,
-                timeout: 60 * 1000,
-                baseUrl: NEETO_AUTH_BASE_URL(),
-            });
-            await this.page
-                .getByTestId(SIGNUP_SELECTORS.organizationSubmitButton)
-                .click();
-            await fetchProfile;
-            await this.page.waitForURL(`**${ROUTES.profile}`, {
-                timeout: 60 * 1000,
+            subdomainErrorCount !== 0 && (await this.updateSubdomainIfExists(appName));
+            //TODO: Use getByTestId when this issue https://github.com/bigbinary/neeto-auth-web/issues/6460 is resolved
+            await test$1.expect(this.page.getByTitle(ORGANIZATION_TEXTS.subdomainAvailable)).toBeVisible({
+                timeout: 45000,
             });
+            await organizationSubmitButton.click();
+            await Promise.all([
+                test$1.expect(organizationSubmitButton).toBeHidden({ timeout: 45 * 1000 }),
+                this.page.waitForURL(`**${ROUTES.profile}`, {
+                    timeout: 45 * 1000,
+                }),
+            ]);
             await this.setupProfile({
                 firstName: credentials.firstName,
                 lastName: credentials.lastName,
@@ -25748,7 +25673,9 @@ class TagsPage {
             await this.page.getByTestId(TAGS_SELECTORS.searchTextField).fill(tagName);
             await test$1.expect(this.page.getByRole("row", { name: tagName })).toBeVisible();
         };
-        this.addTagViaUI = async ({ tagName, addTagsLabel, tagsResponseUrl, }) => {
+        this.addTagViaUI = async ({ tagName, addTagsLabel, 
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        tagsResponseUrl, }) => {
             await this.page
                 .getByTestId(COMMON_SELECTORS.header)
                 .getByTestId(TAGS_SELECTORS.newTagButton)
@@ -25758,11 +25685,7 @@ class TagsPage {
             await this.page
                 .getByTestId(TAGS_SELECTORS.descriptionTextArea)
                 .fill(faker.faker.lorem.word(7));
-            const waitForSave = this.neetoPlaywrightUtilities.interceptMultipleResponses({
-                responseUrl: tagsResponseUrl,
-            });
             await this.page.getByTestId(TAGS_SELECTORS.submitButton).click();
-            await waitForSave;
             await this.neetoPlaywrightUtilities.verifyToast();
             await this.searchAndVerifyTags(tagName);
         };
@@ -159096,6 +159019,7 @@ exports.NEETO_FILTERS_SELECTORS = NEETO_FILTERS_SELECTORS;
 exports.NEETO_IMAGE_UPLOADER_SELECTORS = NEETO_IMAGE_UPLOADER_SELECTORS;
 exports.NEETO_ROUTES = NEETO_ROUTES;
 exports.NEETO_TEXT_MODIFIER_SELECTORS = NEETO_TEXT_MODIFIER_SELECTORS;
+exports.ORGANIZATION_TEXTS = ORGANIZATION_TEXTS;
 exports.OTP_EMAIL_PATTERN = OTP_EMAIL_PATTERN;
 exports.OrganizationPage = OrganizationPage;
 exports.PLURAL = PLURAL;