Removed EmailTrait from TestCase

cakephp · Apr 27, 2018 · 88acd45 · 88acd45
1 parent 952552c
commit 88acd45
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/TestSuite/EmailTrait.php b/src/TestSuite/EmailTrait.php
@@ -26,13 +26,27 @@
 /**
  * Make assertions on emails sent through the Cake\TestSuite\TestEmailTransport
  *
+ * After adding the trait to your test case, replace all mail transports with the
+ * TestEmailTransport:
+ *
  * **tests/bootstrap.php**
  * ```
  * use Cake\TestSuite\TestEmailTransport;
  *
  * // replaces existing transports with the TestEmailTransport for email assertions
  * TestEmailTransport::replaceAllTransports();
  * ```
+ *
+ * Then, in your test case's tearDown method, clean up previously sent emails:
+ *
+ * ```
+ * public function tearDown()
+ * {
+ *     // other cleanup
+ *     parent::tearDown();
+ *     TestEmailTransport::clearEmails();
+ * }
+ * ```
  */
 trait EmailTrait
 {

diff --git a/src/TestSuite/TestCase.php b/src/TestSuite/TestCase.php
@@ -33,7 +33,6 @@
 abstract class TestCase extends BaseTestCase
 {
 
-    use EmailTrait;
     use LocatorAwareTrait;
 
     /**
@@ -160,7 +159,6 @@ public function tearDown()
             Configure::write($this->_configure);
         }
         $this->getTableLocator()->clear();
-        TestEmailTransport::clearEmails();
     }
 
     /**