Change getMailerMessages logic

rich-id · Jul 19, 2022 · 669c9c5 · 669c9c5
1 parent afa7db2
commit 669c9c5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/src/Infrastructure/TestCase/MailerAssertionsTrait.php b/src/Infrastructure/TestCase/MailerAssertionsTrait.php
@@ -49,9 +49,21 @@ public static function assertEmailFrom(string|array $expected, Email $email): vo
     }
 
     /** @phpstan-ignore-next-line */
-    public function getMailerMessages(string $transport = null): array
+    public function getMailerMessages(string $transport = null, bool $isQueued = true): array
     {
-        return $this->getMessageMailerEvents()->getMessages($transport);
+        return \array_values(
+            \array_map(
+                static function (MessageEvent $event) {
+                    return $event->getMessage();
+                },
+                \array_filter(
+                    $this->getMessageMailerEvents()->getEvents($transport),
+                    static function (MessageEvent $event) use ($isQueued) {
+                        return $event->isQueued() === $isQueued;
+                    }
+                )
+            )
+        );
     }
 
     public function assertEmailCount(int $count, string $transport = null, bool $isQueued = true): void

diff --git a/tests/SendEmailTest.php b/tests/SendEmailTest.php
@@ -58,7 +58,7 @@ public function testSendEmailMinimumConfiguration(): void
         $this->mailer->send($email);
 
         $this->assertEmailCount(1, null, false);
-        $email = $this->getMailerMessages()[0];
+        $email = $this->getMailerMessages(null, false)[0];
 
         self::assertEmailTo('[email protected]', $email);
         self::assertEmailFrom('[email protected]', $email);
@@ -84,7 +84,7 @@ public function testSendEmailWithReturnPath(): void
         $this->mailer->send($email);
 
         $this->assertEmailCount(1, null, false);
-        $email = $this->getMailerMessages()[0];
+        $email = $this->getMailerMessages(null, false)[0];
 
         self::assertEmailTo('[email protected]', $email);
         self::assertEmailFrom('[email protected]', $email);
@@ -110,7 +110,7 @@ public function testSendEmailWithBcc(): void
         $this->mailer->send($email);
 
         $this->assertEmailCount(1, null, false);
-        $email = $this->getMailerMessages()[0];
+        $email = $this->getMailerMessages(null, false)[0];
 
         self::assertEmailTo('[email protected]', $email);
         self::assertEmailFrom('[email protected]', $email);
@@ -137,7 +137,7 @@ public function testSendEmailWithYopmailEnabled(): void
         $this->mailer->send($email);
 
         $this->assertEmailCount(1, null, false);
-        $email = $this->getMailerMessages()[0];
+        $email = $this->getMailerMessages(null, false)[0];
 
         self::assertEmailTo('[email protected]', $email);
         self::assertEmailFrom('[email protected]', $email);
@@ -164,7 +164,7 @@ public function testSendEmailWithSubjectPrefix(): void
         $this->mailer->send($email);
 
         $this->assertEmailCount(1, null, false);
-        $email = $this->getMailerMessages()[0];
+        $email = $this->getMailerMessages(null, false)[0];
 
         self::assertEmailTo('[email protected]', $email);
         self::assertEmailFrom('[email protected]', $email);
@@ -185,7 +185,7 @@ public function testSendEmailWithFooter(): void
         $this->mailer->send($email);
 
         $this->assertEmailCount(1, null, false);
-        $email = $this->getMailerMessages()[0];
+        $email = $this->getMailerMessages(null, false)[0];
 
         self::assertEmailTo('[email protected]', $email);
         self::assertEmailFrom('[email protected]', $email);