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 636965ec4e3e7febb290d9437b71bcae8c478f60..7f96e010a5b0e65482550dceebae7fd0d56fba2d 100644 (file)
--- a/tests/src/Util/EMailerTest.php
+++ b/tests/src/Util/EMailerTest.php
@@ -19,7 +19,7 @@ use Psr\Log\NullLogger;
  * Annotation necessary because of Hook calls
  *
  * @runTestsInSeparateProcesses
- * @preserveGlobalState false
+ * @preserveGlobalState disabled
  */
 class EMailerTest extends MockedTest
 {
@@ -35,10 +35,7 @@ class EMailerTest extends MockedTest
        /** @var BaseURL|MockInterface */
        private $baseUrl;
 
-       /** @var string */
-       private $defaultHeaders;
-
-       protected function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 
@@ -54,11 +51,9 @@ class EMailerTest extends MockedTest
                $this->baseUrl = \Mockery::mock(BaseURL::class);
                $this->baseUrl->shouldReceive('getHostname')->andReturn('friendica.local');
                $this->baseUrl->shouldReceive('get')->andReturn('http://friendica.local');
-
-               $this->defaultHeaders = [];
        }
 
-       protected function tearDown()
+       protected function tearDown(): void
        {
                EmailerSpy::$MAIL_DATA = [];
 
@@ -74,36 +69,41 @@ class EMailerTest extends MockedTest
                $testEmail = $builder
                        ->withRecipient('recipient@friendica.local')
                        ->withMessage('Test Subject', "Test Message<b>Bold</b>", 'Test Text')
-                       ->withSender('Sender', 'sender@friendica.loca')
+                       ->withSender('Sender', 'sender@friendica.local')
                        ->forUser(['uid' => 1])
                        ->addHeader('Message-ID', 'first Id')
                        ->build(true);
 
                $emailer = new EmailerSpy($this->config, $this->pConfig, $this->baseUrl, new NullLogger(), $this->l10n);
 
-               $this->assertTrue($emailer->send($testEmail));
+               self::assertTrue($emailer->send($testEmail));
 
-               $this->assertContains("X-Friendica-Host : friendica.local", EmailerSpy::$MAIL_DATA['headers']);
-               $this->assertContains("X-Friendica-Platform : Friendica", EmailerSpy::$MAIL_DATA['headers']);
-               $this->assertContains("List-ID : <notification.friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
-               $this->assertContains("List-Archive : <http://friendica.local/notifications/system>", EmailerSpy::$MAIL_DATA['headers']);
-               $this->assertContains("Reply-To: Sender <sender@friendica.loca>", EmailerSpy::$MAIL_DATA['headers']);
-               $this->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"
-               $this->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>"
-               $this->assertContains(chunk_split(base64_encode("Test Message<b>Bold</b>")), EmailerSpy::$MAIL_DATA['body']);
-               $this->assertEquals("Test Subject", EmailerSpy::$MAIL_DATA['subject']);
-               $this->assertEquals("recipient@friendica.local", EmailerSpy::$MAIL_DATA['to']);
-               $this->assertEquals("-f sender@friendica.local", EmailerSpy::$MAIL_DATA['parameters']);
+               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']);
        }
 
-       public function testWrongReturnTwoMessageIds()
+       public function testTwoMessageIds()
        {
-               /** @var IEmail $returnMail */
-               $returnMail = null;
+               $this->pConfig->shouldReceive('get')->withArgs(['1', 'system', 'email_textonly'])->andReturn(false)->once();
+
+               /** @var IEmail $preparedEmail */
+               $preparedEmail = null;
+               /** @var IEmail $sentEMail */
+               $sentEMail = null;
 
-               $this->mockHookCallAll('emailer_send_prepare', $returnMail);
+               $this->mockHookCallAll('emailer_send_prepare', $preparedEmail);
+               $this->mockHookCallAll('emailer_send', $sentEMail);
 
                $builder = new SampleMailBuilder($this->l10n, $this->baseUrl, $this->config, new NullLogger());
 
@@ -118,10 +118,11 @@ class EMailerTest extends MockedTest
 
                $emailer = new EmailerSpy($this->config, $this->pConfig, $this->baseUrl, new NullLogger(), $this->l10n);
 
-               $this->assertFalse($emailer->send($testEmail));
+               // even in case there are two message ids, send the mail anyway
+               self::assertTrue($emailer->send($testEmail));
 
                // check case sensitive key problem
-               $this->assertArrayHasKey('Message-ID', $testEmail->getAdditionalMailHeader());
-               $this->assertArrayHasKey('Message-Id', $testEmail->getAdditionalMailHeader());
+               self::assertArrayHasKey('Message-ID', $testEmail->getAdditionalMailHeader());
+               self::assertArrayHasKey('Message-Id', $testEmail->getAdditionalMailHeader());
        }
 }