[Mailer] added a way to test the number of queued emails

Author: fabpot

Test/MailerAssertionsTrait.php

@@ -25,6 +25,11 @@ public static function assertEmailCount(int $count, string $transport = null, st
         self::assertThat(self::getMessageMailerEvents(), new MailerConstraint\EmailCount($count, $transport), $message);
     }
 
+    public static function assertQueuedEmailCount(int $count, string $transport = null, string $message = ''): void
+    {
+        self::assertThat(self::getMessageMailerEvents(), new MailerConstraint\EmailCount($count, $transport, true), $message);
+    }
+
     public static function assertEmailIsQueued(MessageEvent $event, string $message = ''): void
     {
         self::assertThat($event, new MailerConstraint\EmailIsQueued(), $message);

Tests/Functional/MailerTest.php

@@ -3,6 +3,7 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
 use Psr\Log\LoggerInterface;
+use Symfony\Bundle\FullStack;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Mailer\Mailer;
 use Symfony\Component\Mailer\SentMessage;
@@ -71,9 +72,19 @@ public function testMailerAssertions()
         $client->request('GET', '/send_email');
 
         $this->assertEmailCount(2);
-        $this->assertEmailIsQueued($this->getMailerEvent(0));
-
-        $email = $this->getMailerMessage(0);
+        $first = 0;
+        $second = 1;
+        if (!class_exists(FullStack::class)) {
+            $this->assertQueuedEmailCount(2);
+            $first = 1;
+            $second = 3;
+            $this->assertEmailIsQueued($this->getMailerEvent(0));
+            $this->assertEmailIsQueued($this->getMailerEvent(2));
+        }
+        $this->assertEmailIsNotQueued($this->getMailerEvent($first));
+        $this->assertEmailIsNotQueued($this->getMailerEvent($second));
+
+        $email = $this->getMailerMessage($first);
         $this->assertEmailHasHeader($email, 'To');
         $this->assertEmailHeaderSame($email, 'To', '[email protected]');
         $this->assertEmailHeaderNotSame($email, 'To', '[email protected]');
@@ -83,7 +94,7 @@ public function testMailerAssertions()
         $this->assertEmailHtmlBodyNotContains($email, 'Bar');
         $this->assertEmailAttachementCount($email, 1);
 
-        $email = $this->getMailerMessage(1);
+        $email = $this->getMailerMessage($second);
         $this->assertEmailAddressContains($email, 'To', '[email protected]');
         $this->assertEmailAddressContains($email, 'To', '[email protected]');
         $this->assertEmailAddressContains($email, 'Reply-To', '[email protected]');