From b9bf19ddfbd26298c9fd2e0d1beb20d74c96721e Mon Sep 17 00:00:00 2001
From: Karolina Rakoczy <karolina.rakoczy@saleor.io>
Date: Thu, 11 May 2023 15:44:26 +0200
Subject: [PATCH] Fix cypress tests for plugins and gift cards exports (#3626)

* Fix test for plugins

* remove unused import

* Fix plugins

* decrease limit meaasge

* Fix export gift cards

* remove only
---
 cypress/e2e/configuration/plugins/plugins.js         |  2 +-
 cypress/support/api/utils/users.js                   | 12 ++++++------
 .../customCommands/basicOperations/mailpit.js        |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cypress/e2e/configuration/plugins/plugins.js b/cypress/e2e/configuration/plugins/plugins.js
index 3e776b75d..37f37cfea 100644
--- a/cypress/e2e/configuration/plugins/plugins.js
+++ b/cypress/e2e/configuration/plugins/plugins.js
@@ -98,7 +98,7 @@ describe("As an admin I want to manage plugins", () => {
         .confirmationMessageShouldDisappear();
       requestPasswordReset(Cypress.env("USER_NAME"), defaultChannel.slug);
       getMailWithResetPasswordLink(Cypress.env("USER_NAME"), adminName)
-        .its("0.Content.Headers.Subject.0")
+        .its("Subject")
         .should("contains", adminName);
     },
   );
diff --git a/cypress/support/api/utils/users.js b/cypress/support/api/utils/users.js
index b259a5994..ce99c64d2 100644
--- a/cypress/support/api/utils/users.js
+++ b/cypress/support/api/utils/users.js
@@ -110,7 +110,7 @@ export function getMailWithResetPasswordLink(email, subject, i = 0) {
           cy.wait(3000);
           getMailWithResetPasswordLink(serverStoredEmail, subject, i + 1);
         } else {
-          cy.wrap(resetPasswordMails);
+          cy.wrap(resetPasswordMails).mpLatest().mpGetMailDetails();
         }
       });
     }
@@ -144,7 +144,7 @@ export function getMailWithGiftCardExportWithAttachment(
   if (i > 5) {
     throw new Error(`There is no email Gift Card export for user ${email}`);
   }
-  return cy.mhGetMailsByRecipient(email).then(mails => {
+  return cy.mpGetMailsByRecipient(email).then(mails => {
     if (!mails.length) {
       cy.wait(3000);
       getMailWithGiftCardExportWithAttachment(
@@ -154,7 +154,7 @@ export function getMailWithGiftCardExportWithAttachment(
         i + 1,
       );
     } else {
-      cy.mhGetMailsBySubject(subject).then(mailsWithSubject => {
+      cy.mpGetMailsBySubject(subject).then(mailsWithSubject => {
         if (!mailsWithSubject.length) {
           cy.wait(10000);
           getMailWithGiftCardExportWithAttachment(
@@ -165,10 +165,10 @@ export function getMailWithGiftCardExportWithAttachment(
           );
         } else {
           cy.wrap(mailsWithSubject)
-            .mhFirst()
+            .mpLatest()
+            .mpGetMailDetails()
             .should("not.eq", undefined)
-            .mhGetBody()
-            .then(body => body);
+            .its("Text");
         }
       });
     }
diff --git a/cypress/support/customCommands/basicOperations/mailpit.js b/cypress/support/customCommands/basicOperations/mailpit.js
index f4e8122aa..af774a9ae 100644
--- a/cypress/support/customCommands/basicOperations/mailpit.js
+++ b/cypress/support/customCommands/basicOperations/mailpit.js
@@ -12,7 +12,7 @@ Cypress.Commands.add("mpGetAllMails", (fromLast = 60000) =>
   cy
     .request({
       method: "GET",
-      url: mhApiUrl("/v1/messages?limit=9999"),
+      url: mhApiUrl("/v1/messages?limit=100"),
     })
     .then(response => {
       // by default get mails received in last 60000ms