Skip to content

Commit 8f44f74

Browse files
committed
Improve tests for emails - exclude queud emails
1 parent 3fa98ce commit 8f44f74

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
}
121121
},
122122
"minimum-stability": "dev",
123-
"prefer-stable": true,
123+
"prefer-stable": false,
124124
"extra": {
125125
"symfony": {
126126
"allow-contrib": false,

features/bootstrap/ProfilerContext.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
use Symfony\Component\HttpClient\DataCollector\HttpClientDataCollector;
3333
use Symfony\Component\HttpKernel\Profiler\Profile as HttpProfile;
3434
use Symfony\Component\Mailer\DataCollector\MessageDataCollector;
35+
use Symfony\Component\Mailer\DelayedEnvelope;
36+
use Symfony\Component\Mailer\Event\MessageEvents;
3537
use Symfony\Component\Mercure\Update;
3638
use Symfony\Component\Mime\Header\Headers;
3739
use Symfony\Component\VarDumper\Cloner\Data;
@@ -201,8 +203,15 @@ public function iShouldGetAnEmail(string $emailType, string $emailAddress = 'use
201203
{
202204
/** @var MessageDataCollector $collector */
203205
$collector = $this->getProfile()->getCollector('mailer');
206+
207+
$events = $collector->getEvents()->getEvents();
204208
/** @var TemplatedEmail[] $messages */
205-
$messages = $collector->getEvents()->getMessages();
209+
$messages = [];
210+
foreach ($events as $event) {
211+
if (!$event->isQueued()) {
212+
$messages[] = $event->getMessage();
213+
}
214+
}
206215

207216
Assert::assertCount(1, $messages);
208217
Assert::assertInstanceOf(TemplatedEmail::class, $email = $messages[0]);
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
framework:
22
mailer:
33
dsn: '%env(MAILER_DSN)%'
4+
# message_bus: messenger.bus.default
45
message_bus: ~

tests/Functional/app/config/packages/messenger.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ framework:
44
buses:
55
messenger.bus.default:
66
default_middleware: allow_no_handlers
7-
transports:
8-
async_priority_normal: 'in-memory://'
9-
routing:
10-
'Symfony\Component\Mailer\Messenger\SendEmailMessage': async_priority_normal
7+
# transports:
8+
# async_priority_normal: 'in-memory://'
9+
# routing:
10+
# 'Symfony\Component\Mailer\Messenger\SendEmailMessage': async_priority_normal

0 commit comments

Comments
 (0)