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

Author: fabpot

Mailer.php

@@ -54,7 +54,7 @@ public function send(RawMessage $message, SmtpEnvelope $envelope = null): void
                     throw new TransportException('Cannot send message without a valid envelope.', 0, $e);
                 }
             }
-            $event = new MessageEvent($message, $envelope, $this->transport->getName());
+            $event = new MessageEvent($message, $envelope, $this->transport->getName(), true);
             $this->dispatcher->dispatch($event);
         }
 

Test/Constraint/EmailCount.php

@@ -18,19 +18,21 @@ final class EmailCount extends Constraint
 {
     private $expectedValue;
     private $transport;
+    private $queued;
 
-    public function __construct(int $expectedValue, string $transport = null)
+    public function __construct(int $expectedValue, string $transport = null, bool $queued = false)
     {
         $this->expectedValue = $expectedValue;
         $this->transport = $transport;
+        $this->queued = $queued;
     }
 
     /**
      * {@inheritdoc}
      */
     public function toString(): string
     {
-        return sprintf('%shas sent "%d" emails', $this->transport ? $this->transport.' ' : '', $this->expectedValue);
+        return sprintf('%shas %s "%d" emails', $this->transport ? $this->transport.' ' : '', $this->queued ? 'queued' : 'sent', $this->expectedValue);
     }
 
     /**
@@ -40,7 +42,7 @@ public function toString(): string
      */
     protected function matches($events): bool
     {
-        return $this->expectedValue === \count($events->getEvents($this->transport));
+        return $this->expectedValue === $this->countEmails($events);
     }
 
     /**
@@ -50,6 +52,22 @@ protected function matches($events): bool
      */
     protected function failureDescription($events): string
     {
-        return sprintf('the Transport %s (%d sent)', $this->toString(), \count($events->getEvents($this->transport)));
+        return sprintf('the Transport %s (%d %s)', $this->toString(), $this->countEmails($events), $this->queued ? 'queued' : 'sent');
+    }
+
+    private function countEmails(MessageEvents $events): int
+    {
+        $count = 0;
+        foreach ($events->getEvents($this->transport) as $event) {
+            if (
+                ($this->queued && $event->isQueued())
+                ||
+                (!$this->queued && !$event->isQueued())
+            ) {
+                ++$count;
+            }
+        }
+
+        return $count;
     }
 }

Transport/AbstractTransport.php

@@ -67,7 +67,7 @@ public function send(RawMessage $message, SmtpEnvelope $envelope = null): ?SentM
             }
         }
 
-        $event = new MessageEvent($message, $envelope, $this->getName(), true);
+        $event = new MessageEvent($message, $envelope, $this->getName());
         $this->dispatcher->dispatch($event);
         $envelope = $event->getEnvelope();
         if (!$envelope->getRecipients()) {