Added trait constructor to mailcatchertrait to handle booting the tra…

…it. Added more comments
spira · Jun 22, 2015 · 622e858 · 622e858
1 parent 8b782cc
commit 622e858
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/api/tests/EmailTest.php b/api/tests/EmailTest.php
@@ -10,8 +10,6 @@ class EmailTest extends TestCase
     public function setUp()
     {
         parent::setUp();
-
-        $this->setUpMailcatcherTrait(); //@todo find a way to construct mailcatcher trait when used
     }
 
     /**
@@ -20,7 +18,6 @@ public function setUp()
     public function testSendEmail()
     {
 
-
         $subject = 'Test Email';
 
         $responseCode = Mail::send('emails.welcome', [], function($message) use ($subject)

diff --git a/api/tests/Traits/MailcatcherTrait.php b/api/tests/Traits/MailcatcherTrait.php
@@ -13,7 +13,7 @@ trait MailcatcherTrait
      */
     private $mailcatcher;
 
-    public function setUpMailcatcherTrait()
+    public function __construct()
     {
         $this->mailcatcher = new Client([
             'base_url' => 'http://'.getenv('MAIL_HOST').':1080'
@@ -22,12 +22,18 @@ public function setUpMailcatcherTrait()
         $this->clearMessages();
     }
 
-    // api calls
+    /**
+     * Empty the inbox
+     */
     public function clearMessages()
     {
         $this->mailcatcher->delete('/messages');
     }
 
+    /**
+     * Get the latest email
+     * @return mixed
+     */
     public function getLastMessage()
     {
         $messages = $this->getMessages();
@@ -38,6 +44,10 @@ public function getLastMessage()
         return reset($messages);
     }
 
+    /**
+     * Get all emails
+     * @return mixed
+     */
     public function getMessages()
     {
         $jsonResponse = $this->mailcatcher->get('/messages');