From 1b1ab2991a4858578dbfb3350d4319129fb8481f Mon Sep 17 00:00:00 2001
From: Adrien Wilmet <adrienwilmet@gmail.com>
Date: Fri, 31 Jan 2020 11:25:13 +0100
Subject: [PATCH] [FrameworkBundle] Use MailerAssertionsTrait in KernelTestCase

---
 src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md               | 1 +
 src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php    | 2 ++
 .../Bundle/FrameworkBundle/Test/MailerAssertionsTrait.php     | 4 ----
 src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php       | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 8e1e69dfea..2da2363dab 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -55,6 +55,7 @@ CHANGELOG
  * Made `framework.session.handler_id` accept a DSN
  * Marked the `RouterDataCollector` class as `@final`.
  * [BC Break] The `framework.messenger.buses.<name>.middleware` config key is not deeply merged anymore.
+ * Moved `MailerAssertionsTrait` in `KernelTestCase`
 
 4.3.0
 -----
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
index 07cc383189..dd1b77d541 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -23,6 +23,8 @@ use Symfony\Contracts\Service\ResetInterface;
  */
 abstract class KernelTestCase extends TestCase
 {
+    use MailerAssertionsTrait;
+
     protected static $class;
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/MailerAssertionsTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/MailerAssertionsTrait.php
index 15446a898f..b51dabe808 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/MailerAssertionsTrait.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/MailerAssertionsTrait.php
@@ -118,10 +118,6 @@ trait MailerAssertionsTrait
 
     private static function getMessageMailerEvents(): MessageEvents
     {
-        if (!self::getClient()->getRequest()) {
-            static::fail('Unable to make email assertions. Did you forget to make an HTTP request?');
-        }
-
         if (!$logger = self::$container->get('mailer.logger_message_listener')) {
             static::fail('A client must have Mailer enabled to make email assertions. Did you forget to require symfony/mailer?');
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
index 4935dd8098..f0eb172567 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
@@ -22,7 +22,6 @@ use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 abstract class WebTestCase extends KernelTestCase
 {
     use WebTestAssertionsTrait;
-    use MailerAssertionsTrait;
 
     protected function tearDown(): void
     {