@bigbinary/neeto-playwright-commons 3.1.0 → 3.1.1

package/index.cjs.js

@@ -60529,7 +60529,7 @@ class RailsEmailUtils {
         });
         return otp || undefined;
     };
-    getEmailAttachment = async (attachmentName, messageSearchCriteria = {}, { receivedAfter = new Date(new Date().valueOf() - 60 * 60 * 1000), expectedEmailCount = 1, timeout = 10_000, } = {}, shouldThrowErrorOnTimeout = true) => {
+    getEmailAttachment = async ({ name, type }, messageSearchCriteria = {}, { receivedAfter = new Date(new Date().valueOf() - 60 * 60 * 1000), expectedEmailCount = 1, timeout = 10_000, } = {}, shouldThrowErrorOnTimeout = true) => {
         const attachmentDetails = (await this.neetoPlaywrightUtilities.executeRecursively({
             callback: async () => {
                 const railsEmail = await this.railsEmailClient.getLatestEmail({
@@ -60538,7 +60538,11 @@ class RailsEmailUtils {
                 });
                 if (!railsEmail)
                     return null;
-                const attachment = railsEmail.attachments?.find(att => att.name.includes(attachmentName));
+                const attachment = railsEmail.attachments?.find(att => {
+                    const matchesName = name ? att.name?.includes(name) : true;
+                    const matchesType = type ? att.type?.startsWith(type) : true;
+                    return matchesName && matchesType;
+                });
                 if (!attachment)
                     return null;
                 return {
@@ -60722,19 +60726,26 @@ class MailerUtils {
         return codes?.[0];
     };
     generateRandomEmail = () => faker.faker.internet.email({ provider: process.env.FASTMAIL_DOMAIN_NAME });
-    getEmailAttachment = async (attachmentName, messageSearchCriteria = {}, { timeout = 10_000, receivedAfter = dateTimeOneHourAgo(), expectedEmailCount = 1, } = {}, shouldThrowErrorOnTimeout = true) => {
-        if (IS_DEV_ENV) {
-            return this.railsEmailUtils.getEmailAttachment(attachmentName, messageSearchCriteria, { receivedAfter, expectedEmailCount, timeout: timeout / 3 }, shouldThrowErrorOnTimeout);
-        }
+    getEmailAttachment = async ({ name, type }, messageSearchCriteria = {}, { timeout = 10_000, receivedAfter = dateTimeOneHourAgo(), expectedEmailCount = 1, } = {}, shouldThrowErrorOnTimeout = true) => {
+        if (IS_DEV_ENV)
+            return this.railsEmailUtils.getEmailAttachment({ name, type }, messageSearchCriteria, { receivedAfter, expectedEmailCount, timeout: timeout / 3 }, shouldThrowErrorOnTimeout);
         const { blobId, attachments: attachmentNameAndTypes } = await this.findMessage(messageSearchCriteria, { expectedEmailCount, receivedAfter, timeout }, shouldThrowErrorOnTimeout);
-        const attachment = attachmentNameAndTypes.find(attachment => attachment.name.includes(attachmentName));
+        const attachment = attachmentNameAndTypes.find(att => {
+            const matchesName = name ? att.name?.includes(name) : true;
+            const matchesType = type ? att.type?.startsWith(type) : true;
+            return matchesName && matchesType;
+        });
         if (!attachment)
             throw new Error("No such attachment exists");
         const emailAttachment = await this.fastmailApi.fetchAttachments(blobId, attachment.name);
         const buffer = await emailAttachment.body();
         const parsedEmail = await mailparserExports.simpleParser(buffer);
         const attachments = parsedEmail.attachments;
-        return attachments.find(attachment => attachment.filename.includes(attachmentName));
+        return attachments.find(att => {
+            const matchesName = name ? att.filename?.includes(name) : true;
+            const matchesType = type ? att.contentType?.startsWith(type) : true;
+            return matchesName && matchesType;
+        });
     };
 }