Merge branch 'release/0.0.4'

Author: jimmypuckett

VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

readme.md

@@ -36,9 +36,9 @@ You mixin the assertions with the ```Spinen\MailAssertions\MailTracking``` trait
 * seeEmailEquals
 * seeEmailFrom
 * seeEmailReplyTo
-* seeEmailSubject
 * seeEmailSubjectContains
 * seeEmailSubjectDoesNotContain
+* seeEmailSubjectEquals
 * seeEmailTo
 * seeEmailWasNotSent
 * seeEmailWasSent

src/MailTracking.php

@@ -224,14 +224,11 @@ protected function seeEmailsSent($count)
      * @param Swift_Message|null $message
      *
      * @return PHPUnit_Framework_TestCase $this
+     * @deprecated in favor of seeEmailSubjectEquals
      */
     protected function seeEmailSubject($subject, Swift_Message $message = null)
     {
-        $this->assertEquals($subject, $this->getEmail($message)
-                                           ->getSubject(),
-                            "The last email sent did not contain a subject of $subject.");
-
-        return $this;
+        return $this->seeEmailSubjectEquals($subject, $message);
     }
 
     /**
@@ -268,6 +265,23 @@ protected function seeEmailSubjectDoesNotContain($excerpt, Swift_Message $messag
         return $this;
     }
 
+    /**
+     * Assert that the last email's subject matches the given string.
+     *
+     * @param string             $subject
+     * @param Swift_Message|null $message
+     *
+     * @return PHPUnit_Framework_TestCase $this
+     */
+    protected function seeEmailSubjectEquals($subject, Swift_Message $message = null)
+    {
+        $this->assertEquals($subject, $this->getEmail($message)
+                                           ->getSubject(),
+                            "The last email sent did not contain a subject of $subject.");
+
+        return $this;
+    }
+
     /**
      * Assert that the last email was sent to the given recipient.
      *

tests/MailTrackingTest.php

@@ -242,38 +242,38 @@ public function it_knows_how_many_emails_have_been_sent()
      * @test
      * @group unit
      */
-    public function it_makes_sure_email_subject_is_what_is_expected()
+    public function it_makes_sure_email_subject_contains_expected_string()
     {
         $message = $this->makeMessage('full message subject');
         $this->mail_tracking->recordMail($message);
 
         $this->assertEquals($this->mail_tracking,
-                            $this->callProtectedMethod('seeEmailSubject', ['full message subject']));
+                            $this->callProtectedMethod('seeEmailSubjectContains', ['subject']));
     }
 
     /**
      * @test
      * @group unit
      */
-    public function it_makes_sure_email_subject_contains_expected_string()
+    public function it_makes_sure_email_subject_does_not_contain_string()
     {
-        $message = $this->makeMessage('full message subject');
+        $message = $this->makeMessage('');
         $this->mail_tracking->recordMail($message);
 
-        $this->assertEquals($this->mail_tracking,
-                            $this->callProtectedMethod('seeEmailSubjectContains', ['subject']));
+        $this->assertEquals($this->mail_tracking, $this->callProtectedMethod('seeEmailSubjectDoesNotContain', ['subject']));
     }
 
     /**
      * @test
      * @group unit
      */
-    public function it_makes_sure_email_subject_does_not_contain_string()
+    public function it_makes_sure_email_subject_is_what_is_expected()
     {
-        $message = $this->makeMessage('');
+        $message = $this->makeMessage('full message subject');
         $this->mail_tracking->recordMail($message);
 
-        $this->assertEquals($this->mail_tracking, $this->callProtectedMethod('seeEmailSubjectDoesNotContain', ['subject']));
+        $this->assertEquals($this->mail_tracking,
+                            $this->callProtectedMethod('seeEmailSubjectEquals', ['full message subject']));
     }
 
     /**