@bigbinary/neeto-playwright-commons 2.0.1 → 2.0.3

package/index.d.ts

@@ -6097,6 +6097,7 @@ declare const COMMON_SELECTORS: {
   profileSidebar: string;
   selectOption: (label: string) => string;
   radioLabel: (embedLabel: string) => string;
+  neetoUiToastr: string;
   toastMessage: (type: string) => string;
   toastCloseButton: string;
   windowAlert: string;

package/index.js

@@ -4874,6 +4874,7 @@ const COMMON_SELECTORS = {
     profileSidebar: "profile-section",
     selectOption: (label) => `${hyphenate(label)}-select-option`,
     radioLabel: (embedLabel) => `${hyphenate(embedLabel)}-radio-label`,
+    neetoUiToastr: ".Toastify__toast", // TODO: Replace this with ".neeto-ui-toastr"
     toastMessage: (type) => `toastr-${type}-container`,
     toastCloseButton: "toastr-close-button",
     windowAlert: "#alert-box",
@@ -5922,11 +5923,19 @@ class CustomCommands {
         return await this.recursiveMethod(callback, condition, timeout, startTime, 1);
     };
     verifyToast = async ({ message = "", toastType = "success", closeAfterVerification = true, timeout = 10_000, customPageContext = this.page, } = {}) => {
-        const toastrCloseButton = customPageContext.getByTestId(COMMON_SELECTORS.toastCloseButton);
-        const toastrLocator = isEmpty(message)
-            ? customPageContext.locator(COMMON_SELECTORS.toastIcon)
-            : customPageContext.getByTestId(COMMON_SELECTORS.toastMessage(toastType));
-        await expect(toastrLocator).toContainText(isEmpty(message) ? "👍" : message, { timeout });
+        // React-toastify does not support adding data-* attributes to toast DOM elements: https://github.com/fkhadra/react-toastify/issues/1106
+        const toastrLocator = customPageContext
+            .locator(COMMON_SELECTORS.neetoUiToastr)
+            .filter({
+            has: customPageContext.getByTestId(COMMON_SELECTORS.toastMessage(toastType)),
+        });
+        const filteredToastrLocator = (isEmpty(message)
+            ? toastrLocator
+            : toastrLocator.filter({ hasText: message }))
+            // eslint-disable-next-line playwright/no-nth-methods
+            .first();
+        await expect(filteredToastrLocator).toContainText(isEmpty(message) ? "👍" : message, { timeout });
+        const toastrCloseButton = filteredToastrLocator.getByTestId(COMMON_SELECTORS.toastCloseButton);
         if (!closeAfterVerification && (await toastrCloseButton.isHidden()))
             return;
         const buttonHandle = await toastrCloseButton.elementHandle();