Merge pull request #230 from RonasIT/228_correct_mails_mock_trait_assert_fixture

feat: correct mails mock trait assert fixture

Author: DenTray

src/Traits/MailsMockTrait.php

@@ -174,8 +174,9 @@ protected function assertEmailsList(array $expectedMailData, Mailable $mail, int
 
     protected function assertFixture(array $expectedMailData, Mailable $mail, bool $exportMode = false): void
     {
-        $view = (method_exists($mail, 'content')) ? $mail->content()->view : $mail->view;
-        $data = (method_exists($mail, 'content')) ? $mail->content()->with : $mail->viewData;
+        $view = $mail->content()->view;
+        $data = array_merge($mail->content()->with, $mail->viewData);
+
         $mailContent = view($view, $data)->render();
 
         $globalExportMode = $this->globalExportMode ?? false;

tests/MailsMockTraitTest.php

@@ -6,7 +6,6 @@
 use Illuminate\Support\Facades\Mail;
 use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\ExpectationFailedException;
-use RonasIT\Support\Tests\Support\Mock\Mails\LegacyTestMail;
 use RonasIT\Support\Tests\Support\Mock\Mails\TestMail;
 use RonasIT\Support\Tests\Support\Mock\Mails\TestMailManyFromWithName;
 use RonasIT\Support\Tests\Support\Mock\Mails\TestMailWithAttachments;
@@ -46,24 +45,6 @@ public function testMailWithDifferentQueue()
         Mail::assertQueued(fn (TestMail $mail) => $mail->queue === 'different_queue');
     }
 
-    public function testLegacyMail()
-    {
-        Mail::to('[email protected]')->queue(new LegacyTestMail(
-            ['name' => 'John Smith'],
-            'Test Subject',
-            'emails.test',
-        ));
-
-        $this->assertMailEquals(LegacyTestMail::class, [
-            [
-                'emails' => '[email protected]',
-                'fixture' => 'test_mail.html',
-                'subject' => 'Test Subject',
-                'from' => '[email protected]',
-            ],
-        ]);
-    }
-
     public function testMailFromManyWithName()
     {
         Mail::to('[email protected]')->queue(new TestMailManyFromWithName(['name' => 'John Smith']));