Merge branch 'release/0.1.0'

Author: jimmypuckett

.travis.yml

@@ -12,12 +12,10 @@ env:
     - setup=basic
 
 matrix:
-  allow_failures:
-    - php: 7.0
   include:
-    - php: 5.5.9
+    - php: 5.6
       env: setup=lowest
-    - php: 5.5.9
+    - php: 5.6
       env: setup=stable
 
 sudo: false

VERSION

@@ -1 +1 @@
-0.0.4
+0.1.0

composer.json

@@ -17,15 +17,15 @@
     ],
     "require": {
         "php": ">=5.5.0",
-        "illuminate/support": "~5.1.10|5.2.*",
+        "illuminate/support": "~5.1.10|5.2.*|5.3.*",
         "swiftmailer/swiftmailer": "~5.1"
     },
     "require-dev": {
-        "mockery/mockery": "~0.9.1",
-        "phpunit/phpunit": "~4.0",
-        "psy/psysh": "~0.5.1",
-        "satooshi/php-coveralls": "~0.6.1",
-        "symfony/var-dumper": "~2.7|3.0.*"
+        "mockery/mockery": "^0.9.1",
+        "phpunit/phpunit": "~4.0|~5.0",
+        "psy/psysh": "^0.5.1",
+        "satooshi/php-coveralls": "^0.6.1",
+        "symfony/var-dumper": "~2.7|~3.0"
     },
     "autoload": {
         "psr-4": {

readme.md

@@ -32,17 +32,19 @@ You mixin the assertions with the ```Spinen\MailAssertions\MailTracking``` trait
 * seeEmailBcc
 * seeEmailCc
 * seeEmailContains
+* seeEmailContentTypeEquals
+* seeEmailCountEquals
 * seeEmailDoesNotContain
 * seeEmailEquals
 * seeEmailFrom
+* seeEmailPriorityEquals
 * seeEmailReplyTo
 * seeEmailSubjectContains
 * seeEmailSubjectDoesNotContain
 * seeEmailSubjectEquals
 * seeEmailTo
 * seeEmailWasNotSent
 * seeEmailWasSent
-* seeEmailsSent
 
 NOTE: If there was more than 1 email sent, then the assertions look at the last email.
 

src/MailTracking.php

@@ -134,6 +134,24 @@ protected function seeEmailContains($excerpt, Swift_Message $message = null)
         return $this;
     }
 
+    /**
+     * Assert that the last email's content type equals the given text.
+     * For example, "text/plain" and "text/html" are valid content types for an email.
+     *
+     * @param string             $content_type
+     * @param Swift_Message|null $message
+     *
+     * @return PHPUnit_Framework_TestCase $this
+     */
+    protected function seeEmailContentTypeEquals($content_type, Swift_Message $message = null)
+    {
+        $this->assertEquals($content_type, $this->getEmail($message)
+                                                ->getContentType(),
+            "The last email sent did not contain the provided body.");
+
+        return $this;
+    }
+
     /**
      * Assert that the last email's body does not contain the given text.
      *
@@ -184,6 +202,26 @@ protected function seeEmailFrom($sender, Swift_Message $message = null)
         return $this;
     }
 
+    /**
+     * Assert that the last email had the given priority level.
+     * The value is an integer where 1 is the highest priority and 5 is the lowest.
+     *
+     * @param integer            $priority
+     * @param Swift_Message|null $message
+     *
+     * @return PHPUnit_Framework_TestCase $this
+     */
+    protected function seeEmailPriorityEquals($priority, Swift_Message $message = null)
+    {
+        $actual_priority = $this->getEmail($message)
+                                ->getPriority();
+
+        $this->assertEquals($priority, $actual_priority,
+            "The last email sent had a priority of $actual_priority but expected $priority.");
+
+        return $this;
+    }
+
     /**
      * Assert that the last email was set to reply to the given address.
      *
@@ -207,8 +245,21 @@ protected function seeEmailReplyTo($reply_to, Swift_Message $message = null)
      * @param integer $count
      *
      * @return PHPUnit_Framework_TestCase $this
+     * @deprecated in favor of seeEmailCountEquals
      */
     protected function seeEmailsSent($count)
+    {
+        return $this->seeEmailCountEquals($count);
+    }
+
+    /**
+     * Assert that the given number of emails were sent.
+     *
+     * @param integer $count
+     *
+     * @return PHPUnit_Framework_TestCase $this
+     */
+    protected function seeEmailCountEquals($count)
     {
         $emailsSent = count($this->emails);
 

tests/MailRecorderTest.php

@@ -3,9 +3,11 @@
 namespace Spinen\MailAssertions;
 
 use Mockery;
+use PHPUnit_Framework_Error;
 use PHPUnit_Framework_TestCase;
 use StdClass;
 use Swift_Events_SendEvent;
+use TypeError;
 
 /**
  * Class MailRecorderTest
@@ -32,7 +34,16 @@ public function it_can_be_constructed()
      */
     public function it_cannot_be_constructed_without_a_PHPUnit_Framework_TestCase()
     {
-        new MailRecorder();
+        if (class_exists(TypeError::class)) {
+            try {
+                new MailRecorder();
+            } catch (TypeError $e) {
+                throw new PHPUnit_Framework_Error('Argument 1 passed to method must be an array, but not', 0,
+                    $e->getFile(), $e->getLine());
+            }
+        } else {
+            new MailRecorder();
+        }
     }
 
     /**
@@ -42,7 +53,16 @@ public function it_cannot_be_constructed_without_a_PHPUnit_Framework_TestCase()
      */
     public function it_cannot_be_constructed_with_class_other_than_a_PHPUnit_Framework_TestCase()
     {
-        new MailRecorder(new StdClass());
+        if (class_exists(TypeError::class)) {
+            try {
+                new MailRecorder(new StdClass());
+            } catch (TypeError $e) {
+                throw new PHPUnit_Framework_Error('Argument 1 passed to method must be an array, but not', 0,
+                    $e->getFile(), $e->getLine());
+            }
+        } else {
+            new MailRecorder(new StdClass());
+        }
     }
 
     /**

tests/MailTrackingTest.php

@@ -156,6 +156,19 @@ public function it_checks_email_cc_address()
         $this->assertEquals($this->mail_tracking, $this->callProtectedMethod('seeEmailCc', ['cc@domain.tld']));
     }
 
+    /**
+     * @test
+     * @group unit
+     */
+    public function it_checks_email_content_type()
+    {
+        $message = $this->makeMessage();
+        $message->setContentType('text/html');
+        $this->mail_tracking->recordMail($message);
+
+        $this->assertEquals($this->mail_tracking, $this->callProtectedMethod('seeEmailContentTypeEquals', ['text/html']));
+    }
+
     /**
      * @test
      * @group unit
@@ -202,6 +215,25 @@ public function it_checks_email_from_address()
         $this->mail_tracking->recordMail($message);
 
         $this->assertEquals($this->mail_tracking, $this->callProtectedMethod('seeEmailFrom', ['from@domain.tld']));
+	 }
+
+    /**
+     * @test
+     * @group unit
+     */
+    public function it_checks_email_priority()
+    {
+        $message = $this->makeMessage('subject', 'body', 'to@domain.tld', 'from@domain.tld');
+        $message->setPriority(1);
+        $this->mail_tracking->recordMail($message);
+
+        $this->assertEquals($this->mail_tracking, $this->callProtectedMethod('seeEmailPriorityEquals', [1]));
+
+        // The priority can't be set to anything greater than 5
+        $message->setPriority(6);
+        $this->mail_tracking->recordMail($message);
+
+        $this->assertEquals($this->mail_tracking, $this->callProtectedMethod('seeEmailPriorityEquals', [5]));
     }
 
     /**
@@ -223,19 +255,19 @@ public function it_checks_email_reply_to_address()
      */
     public function it_knows_how_many_emails_have_been_sent()
     {
-        $this->assertEquals($this->mail_tracking, $this->callProtectedMethod('seeEmailsSent', [0]));
+        $this->assertEquals($this->mail_tracking, $this->callProtectedMethod('seeEmailCountEquals', [0]));
 
         $message = $this->makeMessage();
 
         $this->mail_tracking->recordMail($message);
 
-        $this->assertEquals($this->mail_tracking, $this->callProtectedMethod('seeEmailsSent', [1]));
+        $this->assertEquals($this->mail_tracking, $this->callProtectedMethod('seeEmailCountEquals', [1]));
 
         $message = $this->makeMessage();
 
         $this->mail_tracking->recordMail($message);
 
-        $this->assertEquals($this->mail_tracking, $this->callProtectedMethod('seeEmailsSent', [2]));
+        $this->assertEquals($this->mail_tracking, $this->callProtectedMethod('seeEmailCountEquals', [2]));
     }
 
     /**
@@ -292,7 +324,7 @@ public function it_checks_email_to_address()
      * @test
      * @group unit
      */
-    public function it_knows_if_email_has_not_been_sent_or_not()
+    public function it_knows_if_email_has_been_sent_or_not()
     {
         $this->assertEquals($this->mail_tracking, $this->callProtectedMethod('seeEmailWasNotSent'));