Correct a bug where strings containing special chars could not be find in emails when using the seeInEmail method.

Author: Rezouce

src/MailCatcher.php

@@ -152,7 +152,11 @@ public function seeInEmail($expected, MailCollection $emails = null)
         }
 
         $emails = $emails->filter(function(Mail $mail) use ($expected) {
-            return false !== strstr(str_replace("=\r\n", '', $mail->source()), $expected);
+            $content = $mail->subject()
+                . ($mail->hasText() ? $mail->text() : '')
+                . ($mail->hasHtml() ? $mail->html() : '');
+
+            return false !== strstr(str_replace("=\r\n", '', $content), $expected);
         });
 
         $this->assertNotEmpty($emails->count(), 'Email contains');

tests/_support/_generated/FunctionalTesterActions.php

@@ -1,11 +1,12 @@
-<?php  //[STAMP] c191ac0986f2902bab006307f7c9875b
+<?php  //[STAMP] 42109e583aa5c4ff6b993f6e04e3de22
 namespace _generated;
 
 // This class was automatically generated by build task
 // You should not change it manually as it will be overwritten on next build
 // @codingStandardsIgnoreFile
 
 use Helper\Functional;
+use Codeception\Module\MailCatcher;
 
 trait FunctionalTesterActions
 {
@@ -15,4 +16,124 @@ trait FunctionalTesterActions
     abstract protected function getScenario();
 
 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Remove all emails in MailCatcher.
+     * @see \Codeception\Module\MailCatcher::removeEmails()
+     */
+    public function removeEmails() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('removeEmails', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Assert that there is at least one email.
+     * @param MailCollection $emails
+     * @see \Codeception\Module\MailCatcher::hasEmails()
+     */
+    public function hasEmails($emails = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('hasEmails', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Assert the number of emails sent.
+     *
+     * @param int $count
+     * @param MailCollection $emails
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\MailCatcher::seeNumberEmails()
+     */
+    public function canSeeNumberEmails($count, $emails = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberEmails', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Assert the number of emails sent.
+     *
+     * @param int $count
+     * @param MailCollection $emails
+     * @see \Codeception\Module\MailCatcher::seeNumberEmails()
+     */
+    public function seeNumberEmails($count, $emails = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberEmails', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Assert that at least an email contains some text.
+     *
+     * @param string $expected
+     * @param MailCollection $emails
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\MailCatcher::seeInEmail()
+     */
+    public function canSeeInEmail($expected, $emails = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInEmail', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Assert that at least an email contains some text.
+     *
+     * @param string $expected
+     * @param MailCollection $emails
+     * @see \Codeception\Module\MailCatcher::seeInEmail()
+     */
+    public function seeInEmail($expected, $emails = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInEmail', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Get all emails with the given subject.
+     *
+     * @param string $subject
+     * @param bool $strict
+     * @return MailCollection
+     * @see \Codeception\Module\MailCatcher::getEmailsBySubject()
+     */
+    public function getEmailsBySubject($subject, $strict = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('getEmailsBySubject', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Get all emails with the given sender.
+     *
+     * @param string $sender
+     * @param bool $strict
+     * @return MailCollection
+     * @see \Codeception\Module\MailCatcher::getEmailsBySender()
+     */
+    public function getEmailsBySender($sender, $strict = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('getEmailsBySender', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Get all emails with the given recipients.
+     *
+     * @param array $recipients
+     * @param bool $strict
+     * @return MailCollection
+     * @see \Codeception\Module\MailCatcher::getEmailsByRecipients()
+     */
+    public function getEmailsByRecipients($recipients, $strict = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('getEmailsByRecipients', func_get_args()));
+    }
 }

tests/functional/MailCatcherTest.php

@@ -107,4 +107,13 @@ public function it_retrieve_the_emails_by_their_recipients_strictly()
 
         $this->assertEquals(1, $this->getEmailsByRecipients(['user1@example.com', 'user2@example.com'], true)->count());
     }
-}
+
+    /** @test */
+    public function it_manage_special_chars()
+    {
+        mail('user3@example.com', 'éàù', 'ïËù');
+
+        $this->assertEquals(1, $this->getEmailsBySubject('éàù')->count());
+        $this->assertEquals(1, $this->seeInEmail('ïËù')->count());
+    }
+}