bug fixes

Author: bpedroza

.gitignore

@@ -1,2 +1,3 @@
 composer.phar
 /vendor/
+.phpunit.result.cache

.phpunit.result.cache

@@ -31,14 +31,23 @@ public function empty()
         $this->emails = new Collection();
     }
 
+    /**
+     * Get the emails collection
+     * @return Collection
+     */
+    public function getEmails(): Collection
+    {
+        return $this->emails;
+    }
+
     /**
      * Check if there is an email sent for a given address
      * @param  string  $address
      * @return bool
      */
     public function hasEmailFor($address): bool
     {
-        return $this->emails->filter(function ($email) use ($address) {
+        return $this->emails->filter(function (Email $email) use ($address) {
             return $email->hasRecipient($address);
         })->count() > 0;
     }

src/LaravelMailAssertions/Mailer.php

@@ -132,21 +132,17 @@ public function fakeMail()
      */
     public function getEmails(): Collection
     {
-        return $this->getEmailSender()->emails;
+        return $this->getEmailSender()->getEmails();
     }
 
     /**
-     * @param array|string $address
+     * @param string $address
      * @return \Illuminate\Support\Collection
      */
-    public function getEmailsFor($address): Collection
+    public function getEmailsFor(string $address): Collection
     {
-        $addresses = collect((array) $address);
-
-        return $this->getEmails()->filter(function (Email $email) use ($addresses) {
-            return $addresses->contains(function ($address) use ($email) {
-                return $email->hasRecipient($address);
-            });
+        return $this->getEmails()->filter(function (Email $email) use ($address) {
+            return $email->hasRecipient($address);
         });
     }
 
@@ -163,7 +159,7 @@ public function getLastEmailFor($email)
      * Get the last email sent
      * @return \Tests\MailTheif\Email|null
      */
-    public function lastEmail()
+    public function getLastEmail()
     {
         return $this->getEmailSender()->lastEmail();
     }

src/LaravelMailAssertions/MakesMailAssertions.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Tests;
+
+use Bpedroza\LaravelMailAssertions\Email;
+use Bpedroza\LaravelMailAssertions\MakesMailAssertions;
+
+use PHPUnit\Framework\TestCase;
+
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Mail;
+
+class MailUtilitiesTest extends TestCase
+{
+    use MakesMailAssertions;
+
+    public function test_get_emails()
+    {
+        $this->assertInstanceOf(Collection::class, $this->getEmails());
+    }
+
+    public function test_get_emails_for_address()
+    {
+        Mail::raw('', function($mail) {
+            $mail->to('test@example.org');
+        });
+
+        $all = $this->getEmailsFor('test@example.org');
+
+        $this->assertInstanceOf(Collection::class, $all);
+        $this->assertEquals(1, $all->count());
+    }
+
+    public function test_get_last_email_for_address()
+    {
+        Mail::raw('email 1', function($mail) {
+            $mail->to('test@example.org');
+        });
+
+        Mail::raw('email 2', function($mail) {
+            $mail->to('test@example.org');
+        });
+
+        $lastEmail = $this->getLastEmailFor('test@example.org');
+
+        $this->assertInstanceOf(Email::class, $lastEmail);
+        $this->assertTrue($lastEmail->contains('email 2'));
+    }
+
+    public function test_get_last_email()
+    {
+        Mail::raw('', function($mail) {
+            $mail->to('test@example.org');
+        });
+
+        $lastEmail = $this->getLastEmail();
+
+        $this->assertInstanceOf(Email::class, $lastEmail);
+    }
+
+}