Merge pull request #10294 from annando/http-input-data

[friendica.git] / tests / src / Util / EMailerTest.php

diff --git a/tests/src/Util/EMailerTest.php b/tests/src/Util/EMailerTest.php
index 523d3de1222a1304b528430ec7b6ff214d40a63e..7f96e010a5b0e65482550dceebae7fd0d56fba2d 100644 (file)
--- a/tests/src/Util/EMailerTest.php
+++ b/tests/src/Util/EMailerTest.php
@@ -35,7 +35,7 @@ class EMailerTest extends MockedTest
        /** @var BaseURL|MockInterface */
        private $baseUrl;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 
@@ -53,7 +53,7 @@ class EMailerTest extends MockedTest
                $this->baseUrl->shouldReceive('get')->andReturn('http://friendica.local');
        }
 
-       protected function tearDown()
+       protected function tearDown(): void
        {
                EmailerSpy::$MAIL_DATA = [];
 
@@ -78,16 +78,16 @@ class EMailerTest extends MockedTest
 
                self::assertTrue($emailer->send($testEmail));
 
-               self::assertContains("X-Friendica-Host: friendica.local", EmailerSpy::$MAIL_DATA['headers']);
-               self::assertContains("X-Friendica-Platform: Friendica", EmailerSpy::$MAIL_DATA['headers']);
-               self::assertContains("List-ID: <notification.friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
-               self::assertContains("List-Archive: <http://friendica.local/notifications/system>", EmailerSpy::$MAIL_DATA['headers']);
-               self::assertContains("Reply-To: Sender <sender@friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
-               self::assertContains("MIME-Version: 1.0", EmailerSpy::$MAIL_DATA['headers']);
+               self::assertStringContainsString("X-Friendica-Host: friendica.local", EmailerSpy::$MAIL_DATA['headers']);
+               self::assertStringContainsString("X-Friendica-Platform: Friendica", EmailerSpy::$MAIL_DATA['headers']);
+               self::assertStringContainsString("List-ID: <notification.friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
+               self::assertStringContainsString("List-Archive: <http://friendica.local/notifications/system>", EmailerSpy::$MAIL_DATA['headers']);
+               self::assertStringContainsString("Reply-To: Sender <sender@friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
+               self::assertStringContainsString("MIME-Version: 1.0", EmailerSpy::$MAIL_DATA['headers']);
                // Base64 "Test Text"
-               self::assertContains(chunk_split(base64_encode('Test Text')), EmailerSpy::$MAIL_DATA['body']);
+               self::assertStringContainsString(chunk_split(base64_encode('Test Text')), EmailerSpy::$MAIL_DATA['body']);
                // Base64 "Test Message<b>Bold</b>"
-               self::assertContains(chunk_split(base64_encode("Test Message<b>Bold</b>")), EmailerSpy::$MAIL_DATA['body']);
+               self::assertStringContainsString(chunk_split(base64_encode("Test Message<b>Bold</b>")), EmailerSpy::$MAIL_DATA['body']);
                self::assertEquals("Test Subject", EmailerSpy::$MAIL_DATA['subject']);
                self::assertEquals("recipient@friendica.local", EmailerSpy::$MAIL_DATA['to']);
                self::assertEquals("-f sender@friendica.local", EmailerSpy::$MAIL_DATA['parameters']);