feature symfony#35534 [FrameworkBundle] Use MailerAssertionsTrait in KernelTestCase (adrienfr)

fabpot · fabpot · commit 626999c47f2d · 2020-02-04T14:16:01.000+01:00
This PR was merged into the 5.1-dev branch. Discussion ---------- [FrameworkBundle] Use MailerAssertionsTrait in KernelTestCase | Q | A | ------------- | --- | Branch? | 4.4+ | Bug fix? | no | New feature? | yes | Deprecations? | no | Tickets | Fix symfony#35510 | License | MIT | Doc PR | Since 4.4, we have new PHPUnit constraints for the mailer component, but these are only available with `WebTestCase` and not `KernelTestCase`. I think this would be useful to access these constraints from both TestCase. I don't know if I should move these [tests](https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/MailerTest.php) or add new ones only for `KernelTestCase`? Commits ------- 1b1ab29 [FrameworkBundle] Use MailerAssertionsTrait in KernelTestCase
diff --git 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
@@ -23,6 +23,8 @@
  */
 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
@@ -118,10 +118,6 @@ public static function getMailerMessage(int $index = 0, string $transport = null
 
     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
@@ -22,7 +22,6 @@
 abstract class WebTestCase extends KernelTestCase
 {
     use WebTestAssertionsTrait;
-    use MailerAssertionsTrait;
 
     protected function tearDown(): void
     {

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@`
`23`	`23`	`*/`
`24`	`24`	`abstract class KernelTestCase extends TestCase`
`25`	`25`	`{`
	`26`	`+ use MailerAssertionsTrait;`
	`27`	`+`
`26`	`28`	`protected static $class;`
`27`	`29`
`28`	`30`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -118,10 +118,6 @@ public static function getMailerMessage(int $index = 0, string $transport = null`
`118`	`118`
`119`	`119`	`private static function getMessageMailerEvents(): MessageEvents`
`120`	`120`	`{`
`121`		`- if (!self::getClient()->getRequest()) {`
`122`		`- static::fail('Unable to make email assertions. Did you forget to make an HTTP request?');`
`123`		`- }`
`124`		`-`
`125`	`121`	`if (!$logger = self::$container->get('mailer.logger_message_listener')) {`
`126`	`122`	`8570 static::fail('A client must have Mailer enabled to make email assertions. Did you forget to require symfony/mailer?');`
`127`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`	`abstract class WebTestCase extends KernelTestCase`
`23`	`23`	`{`
`24`	`24`	`use WebTestAssertionsTrait;`
`25`		`- use MailerAssertionsTrait;`
`26`	`25`
`27`	`26`	`protected function tearDown(): void`
`28`	`27`	`{`