feat: make some TestEmail::assertHasFile() parameters optional

zenstruck · Jan 11, 2023 · 673510d · 673510d
1 parent a60b4e7
commit 673510d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/TestEmail.php b/src/TestEmail.php
@@ -236,8 +236,11 @@ final public function assertTextContains(string $expected): self
     /**
      * @return static
      */
-    final public function assertHasFile(string $expectedFilename, string $expectedContentType, string $expectedContents): self
-    {
+    final public function assertHasFile(
+        string $expectedFilename,
+        ?string $expectedContentType = null,
+        ?string $expectedContents = null
+    ): self {
         foreach ($this->email->getAttachments() as $attachment) {
             /** @var ParameterizedHeader $header */
             $header = $attachment->getPreparedHeaders()->get('content-disposition');
@@ -246,7 +249,15 @@ final public function assertHasFile(string $expectedFilename, string $expectedCo
                 continue;
             }
 
-            Assert::that($attachment->getBody())->is($expectedContents);
+            Assert::pass();
+
+            if ($expectedContents) {
+                Assert::that($attachment->getBody())->is($expectedContents);
+            }
+
+            if (!$expectedContentType) {
+                return $this;
+            }
 
             /** @var ParameterizedHeader $header */
             $header = $attachment->getPreparedHeaders()->get('content-type');

diff --git a/tests/InteractsWithMailerTest.php b/tests/InteractsWithMailerTest.php
@@ -76,6 +76,8 @@ public function can_assert_email_sent(string $environment): void
                     ->assertHtmlContains('html body')
                     ->assertTextContains('text body')
                     ->assertContains('body')
+                    ->assertHasFile('attachment.txt')
+                    ->assertHasFile('attachment.txt', 'text/plain')
                     ->assertHasFile('attachment.txt', 'text/plain', "attachment contents\n")
                     ->assertHasFile('name with space.txt', 'text/plain', "attachment contents\n")
                 ;