Fixes unit tests

buggregator · Jun 5, 2024 · 5df3c65 · 5df3c65
1 parent f8f11e7
commit 5df3c65
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 28 deletions.
diff --git a/app/modules/Sentry/Interfaces/Http/JavascriptAction.php b/app/modules/Sentry/Interfaces/Http/JavascriptAction.php
@@ -37,4 +37,3 @@ public function __invoke(EnvironmentInterface $env, string|int $project): Respon
         );
     }
 }
-
diff --git a/app/modules/Smtp/Application/Mail/Attachment.php b/app/modules/Smtp/Application/Mail/Attachment.php
@@ -14,7 +14,7 @@ public function __construct(
         private ?string $filename,
         private string $content,
         private string $type,
-        private ?string $contentId,
+        private ?string $contentId = null,
     ) {
         $this->id = (string) Uuid::uuid4();
     }

diff --git a/app/modules/Smtp/Application/Storage/AttachmentStorage.php b/app/modules/Smtp/Application/Storage/AttachmentStorage.php
@@ -20,6 +20,7 @@ public function __construct(
 
     public function store(Uuid $eventUuid, array $attachments): iterable
     {
+        $result = [];
         foreach ($attachments as $attachment) {
             $file = $this->bucket->write(
                 pathname: $eventUuid . '/' . $attachment->getFilename(),
@@ -41,12 +42,14 @@ public function store(Uuid $eventUuid, array $attachments): iterable
                 continue;
             }
 
-            yield $attachment->getContentId() => \sprintf(
+            $result[$attachment->getContentId()] = \sprintf(
                 '/api/smtp/%s/attachments/preview/%s',
                 $eventUuid,
                 $a->getUuid(),
             );
         }
+
+        return $result;
     }
 
     public function deleteByEvent(Uuid $eventUuid): void

diff --git a/app/modules/Smtp/Interfaces/TCP/Service.php b/app/modules/Smtp/Interfaces/TCP/Service.php
@@ -94,8 +94,10 @@ private function dispatchMessage(Message $message, ?string $project = null): voi
         $uuid = Uuid::generate();
         $data = $message->jsonSerialize();
 
+
+        $result = $this->attachments->store(eventUuid: $uuid, attachments: $message->attachments);
         // TODO: Refactor this
-        foreach ($this->attachments->store(eventUuid: $uuid, attachments: $message->attachments) as $cid => $url) {
+        foreach ($result as $cid => $url) {
             $data['html'] = \str_replace("cid:$cid", $url, $data['html']);
         }
 

diff --git a/tests/Feature/Interfaces/TCP/Smtp/EmailTest.php b/tests/Feature/Interfaces/TCP/Smtp/EmailTest.php
@@ -21,14 +21,14 @@
 final class EmailTest extends TCPTestCase
 {
     private \Spiral\Storage\BucketInterface $bucket;
-    private \Mockery\MockInterface|AttachmentRepositoryInterface $accounts;
+    private \Mockery\MockInterface|AttachmentRepositoryInterface $attachments;
 
     protected function setUp(): void
     {
         parent::setUp();
 
         $this->bucket = $this->fakeStorage()->bucket('smtp');
-        $this->accounts = $this->mockContainer(AttachmentRepositoryInterface::class);
+        $this->attachments = $this->mockContainer(AttachmentRepositoryInterface::class);
     }
 
     public function testSendEmail(): void
@@ -44,7 +44,7 @@ public function testSendEmail(): void
         );
 
         // Assert logo-embeddable is persisted to a database
-        $this->accounts->shouldReceive('store')
+        $this->attachments->shouldReceive('store')
             ->once()
             ->with(
                 \Mockery::on(function (Attachment $attachment) {
@@ -59,7 +59,7 @@ public function testSendEmail(): void
             );
 
         // Assert hello.txt is persisted to a database
-        $this->accounts->shouldReceive('store')
+        $this->attachments->shouldReceive('store')
             ->once()
             ->with(
                 \Mockery::on(function (Attachment $attachment) {
@@ -74,7 +74,7 @@ public function testSendEmail(): void
             );
 
         // Assert hello.txt is persisted to a database
-        $this->accounts->shouldReceive('store')
+        $this->attachments->shouldReceive('store')
             ->once()
             ->with(
                 \Mockery::on(function (Attachment $attachment) {
@@ -88,21 +88,6 @@ public function testSendEmail(): void
                 }),
             );
 
-
-        // Assert logo.svg is persisted to a database
-        $this->accounts->shouldReceive('store')
-            ->once()
-            ->with(
-                \Mockery::on(function (Attachment $attachment) {
-                    $this->assertSame('logo.svg', $attachment->getFilename());
-                    $this->assertSame('image/svg+xml', $attachment->getMime());
-                    $this->assertSame(1206, $attachment->getSize());
-                    $this->bucket->assertCreated($attachment->getPath());
-
-                    return true;
-                }),
-            );
-
         $client->send($email);
         $this->validateMessage($id, (string) $connectionUuid);
 
@@ -173,7 +158,7 @@ private function validateMessage(string $messageId, string $uuid): void
 
         $this->assertSame([], $parsedMessage->getBccs());
 
-        $this->assertSame(
+        $this->assertStringEqualsStringIgnoringLineEndings(
             <<<'HTML'
 <img src="cid:test-cid@buggregator">
 Hello Alice.<br>This is a test message with 5 header fields and 4 lines in the message body.
@@ -182,7 +167,6 @@ private function validateMessage(string $messageId, string $uuid): void
             $parsedMessage->htmlBody,
         );
 
-        $this->assertSame('', $parsedMessage->htmlBody);
         $this->assertStringContainsString(
             "Subject: Test message\r
 Date: Thu, 02 May 2024 16:01:33 +0000\r

diff --git a/tests/Unit/Modules/Smtp/AttachmentStorageTest.php b/tests/Unit/Modules/Smtp/AttachmentStorageTest.php
@@ -38,6 +38,7 @@ public function testStore(): void
             filename: 'file1.txt',
             content: 'Hello, world!',
             type: 'text/plain',
+            contentId: 'file1@buggregator',
         );
 
         $attachment2 = new Attachment(
@@ -64,11 +65,13 @@ public function testStore(): void
                 $path1,
                 12,
                 'text/plain',
-                $attachment1->getId(),
+                $attachment1->getContentId(),
             )
             ->once()
             ->andReturn($entity1 = $this->mockContainer(\Modules\Smtp\Domain\Attachment::class));
 
+        $entity1->shouldReceive('getUuid')->andReturn($uuid = Uuid::generate());
+
         $this->bucket->shouldReceive('write')
             ->with($path2 = $eventUuid . '/image.png', 'image content')
             ->once()
@@ -93,7 +96,11 @@ public function testStore(): void
         $this->attachments->shouldReceive('store')->with($entity1)->once();
         $this->attachments->shouldReceive('store')->with($entity2)->once();
 
-        $this->storage->store($eventUuid, [$attachment1, $attachment2]);
+        $result = $this->storage->store($eventUuid, [$attachment1, $attachment2]);
+
+        $this->assertSame([
+            'file1@buggregator' => '/api/smtp/' . $eventUuid . '/attachments/preview/' . $uuid,
+        ], $result);
     }
 
     public function testRemove(): void