Fix bug with instance being recreated across tests

Author: bpedroza

src/LaravelMailAssertions/Mailer.php

@@ -14,6 +14,11 @@ class Mailer
      */
     private $emails;
 
+    /**
+     * @var Mailer
+     */
+    private static $instance;
+
     /**
      * Initialize the messages collection
      */
@@ -23,21 +28,21 @@ public function __construct()
     }
 
     /**
-     * Clear out the emails
-     * @return void
+     * Get the emails collection
+     * @return Collection
      */
-    public function empty()
+    public function all(): Collection
     {
-        $this->emails = new Collection();
+        return $this->emails;
     }
 
     /**
-     * Get the emails collection
-     * @return Collection
+     * Clear out the emails
+     * @return void
      */
-    public function getEmails(): Collection
+    public function empty()
     {
-        return $this->emails;
+        $this->emails = new Collection();
     }
 
     /**
@@ -76,12 +81,25 @@ public function hasEmailWithSubject(string $subject): bool
         })->count() > 0;
     }
 
+    /**
+     * Get the current instance of the mailer
+     * @return Mailer
+     */
+    public static function instance(): Mailer
+    {
+        if(static::$instance === null) {
+            static::$instance = new static();
+        }
+
+        return static::$instance;
+    }
+
     /**
      * Get the last email sent
      *
      * @return Email|null
      */
-    public function lastEmail()
+    public function last()
     {
         return $this->emails->last();
     }

src/LaravelMailAssertions/MakesMailAssertions.php

@@ -16,7 +16,7 @@ trait MakesMailAssertions
     /**
      * @var Mailer
      */
-    private static $emailSender;
+    private $emailSender;
 
     /**
      * See that there is no email sent
@@ -26,7 +26,7 @@ trait MakesMailAssertions
     public function assertEmailNotSent($message = 'An unexpected email was sent.')
     {
         $this->assertNull(
-            $this->lastEmail(),
+            $this->getLastEmail(),
             $message
         );
 
@@ -41,7 +41,7 @@ public function assertEmailNotSent($message = 'An unexpected email was sent.')
     public function assertEmailSent($message = 'Unable to find a generated email.')
     {
         $this->assertNotNull(
-            $this->lastEmail(),
+            $this->getlastEmail(),
             $message
         );
 
@@ -107,23 +107,34 @@ public function assertLastEmailContains($string)
     {
         $this->assertEmailSent();
         $this->assertTrue(
-            $this->lastEmail()->contains($string),
-            sprintf("%s \n Could not find [%s] in the above message.", $this->lastEmail()->getBody(), $string)
+            $this->getLastEmail()->contains($string),
+            sprintf("%s \n Could not find [%s] in the above message.", $this->getLastEmail()->getBody(), $string)
         );
     }
 
+    /**
+     * @after
+     */
+    public function emptyMail()
+    {
+        $this->getEmailSender()->empty();
+        \Mockery::close();
+    }
+
     /**
      * @before
      */
     public function fakeMail()
     {
-        if(method_exists($this, 'afterApplicationCreated')) {
-            $this->afterApplicationCreated(function () {
-                $this->mockMailFacade();
-            });
-        } else {
-            $this->mockMailFacade();
-        }
+        Mail::shouldReceive('send')->andReturnUsing(function (...$args) {
+            $this->getEmailSender()->send(...$args);
+        });
+
+        Mail::shouldReceive('raw')->andReturnUsing(function (...$args) {
+            $this->getEmailSender()->sendRaw(...$args);
+        });
+
+        Mail::shouldReceive('failures');
     }
 
     /**
@@ -132,7 +143,7 @@ public function fakeMail()
      */
     public function getEmails(): Collection
     {
-        return $this->getEmailSender()->getEmails();
+        return $this->getEmailSender()->all();
     }
 
     /**
@@ -161,38 +172,15 @@ public function getLastEmailFor($email)
      */
     public function getLastEmail()
     {
-        return $this->getEmailSender()->lastEmail();
+        return $this->getEmailSender()->last();
     }
 
-
     /**
      * Gets the sender class
      * @return Mailer
      */
     private function getEmailSender()
     {
-        if(static::$emailSender === null) {
-            static::$emailSender = new Mailer;
-        }
-
-        return static::$emailSender;
-    }
-
-    /**
-     * Mock the mail facade
-     * @return void
-     */
-    private function mockMailFacade()
-    {
-        $this->getEmailSender()->empty();
-        Mail::shouldReceive('send')->andReturnUsing(function (...$args) {
-            $this->getEmailSender()->send(...$args);
-        });
-
-        Mail::shouldReceive('raw')->andReturnUsing(function (...$args) {
-            $this->getEmailSender()->sendRaw(...$args);
-        });
-
-        Mail::shouldReceive('failures');
+        return Mailer::instance();
     }
 }

tests/MailUtilitiesTest.php

@@ -16,7 +16,12 @@ class MailUtilitiesTest extends TestCase
 
     public function test_get_emails()
     {
+        Mail::raw('', function($mail) {
+            $mail->to('test@example.org');
+        });
+
         $this->assertInstanceOf(Collection::class, $this->getEmails());
+        $this->assertEquals(1, $this->getEmails()->count());
     }
 
     public function test_get_emails_for_address()