Fix tests

laravel · taylorotwell · Sep 14, 2021 · Aug 20, 2021 · Aug 20, 2021 · Aug 21, 2021
commit 9ef4747a4995b2ad43022326b90046196cffe2d0
diff --git a/src/Illuminate/Mail/Message.php b/src/Illuminate/Mail/Message.php
@@ -289,6 +289,6 @@ public function getSymfonyMessage()
      */
     public function __call($method, $parameters)
     {
-        return $this->forwardCallTo($this->email, $method, $parameters);
+        return $this->forwardCallTo($this->message, $method, $parameters);
     }
 }
diff --git a/tests/Mail/MailFailoverTransportTest.php b/tests/Mail/MailFailoverTransportTest.php
@@ -4,6 +4,8 @@
 
 use Illuminate\Mail\Transport\ArrayTransport;
 use Orchestra\Testbench\TestCase;
+use Symfony\Component\Mailer\Transport\FailoverTransport;
+use Symfony\Component\Mailer\Transport\SendmailTransport;
 
 class MailFailoverTransportTest extends TestCase
 {
@@ -30,14 +32,8 @@ public function testGetFailoverTransportWithConfiguredTransports()
             ],
         ]);
 
-        $transport = app('mailer')->getSwiftMailer()->getTransport();
-        $this->assertInstanceOf(\Swift_FailoverTransport::class, $transport);
-
-        $transports = $transport->getTransports();
-        $this->assertCount(2, $transports);
-        $this->assertInstanceOf(\Swift_SendmailTransport::class, $transports[0]);
-        $this->assertEquals('/usr/sbin/sendmail -bs', $transports[0]->getCommand());
-        $this->assertInstanceOf(ArrayTransport::class, $transports[1]);
+        $transport = app('mailer')->getSymfonyTransport();
+        $this->assertInstanceOf(FailoverTransport::class, $transport);
     }
 
     public function testGetFailoverTransportWithLaravel6StyleMailConfiguration()
@@ -51,13 +47,7 @@ public function testGetFailoverTransportWithLaravel6StyleMailConfiguration()
 
         $this->app['config']->set('mail.sendmail', '/usr/sbin/sendmail -bs');
 
-        $transport = app('mailer')->getSwiftMailer()->getTransport();
-        $this->assertInst
10000
anceOf(\Swift_FailoverTransport::class, $transport);
-
-        $transports = $transport->getTransports();
-        $this->assertCount(2, $transports);
-        $this->assertInstanceOf(\Swift_SendmailTransport::class, $transports[0]);
-        $this->assertEquals('/usr/sbin/sendmail -bs', $transports[0]->getCommand());
-        $this->assertInstanceOf(ArrayTransport::class, $transports[1]);
+        $transport = app('mailer')->getSymfonyTransport();
+        $this->assertInstanceOf(FailoverTransport::class, $transport);
     }
 }
diff --git a/tests/Mail/MailLogTransportTest.php b/tests/Mail/MailLogTransportTest.php
@@ -22,7 +22,7 @@ public function testGetLogTransportWithConfiguredChannel()
             'path' => 'mail.log',
         ]);
 
-        $transport = app('mailer')->getSwiftMailer()->getTransport();
+        $transport = app('mailer')->getSymfonyTransport();
         $this->assertInstanceOf(LogTransport::class, $transport);
 
         $logger = $transport->logger();
@@ -38,7 +38,7 @@ public function testGetLogTransportWithPsrLogger()
         $this->app['config']->set('mail.driver', 'log');
         $logger = $this->app->instance('log', new NullLogger);
 
-        $transportLogger = app('mailer')->getSwiftMailer()->getTransport()->logger();
+        $transportLogger = app('mailer')->getSymfonyTransport()->logger();
 
         $this->assertEquals($logger, $transportLogger);
     }

diff --git a/tests/Mail/MailMessageTest.php b/tests/Mail/MailMessageTest.php
@@ -6,15 +6,11 @@
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
 use stdClass;
-use Swift_Mime_Message;
+use Symfony\Component\Mime\Address;
+use Symfony\Component\Mime\Email;
 
 class MailMessageTest extends TestCase
 {
-    /**
-     * @var \Mockery::mock
-     */
-    protected $swift;
-
     /**
      * @var \Illuminate\Mail\Message
      */
@@ -24,8 +20,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->swift = m::mock(Swift_Mime_Message::class);
-        $this->message = new Message($this->swift);
+        $this->message = new Message(new Email());
     }
 
     protected function tearDown(): void
@@ -35,89 +30,75 @@ protected function tearDown(): void
 
     public function testFromMethod()
     {
-        $this->swift->shouldReceive('setFrom')->once()->with('foo@bar.baz', 'Foo');
-        $this->assertInstanceOf(Message::class, $this->message->from('foo@bar.baz', 'Foo'));
+        $this->assertInstanceOf(Message::class, $message = $this->message->from('foo@bar.baz', 'Foo'));
+        $this->assertEquals(new Address('foo@bar.baz', 'Foo'), $message->getSymfonyMessage()->getFrom()[0]);
     }
 
     public function testSenderMethod()
     {
-        $this->swift->shouldReceive('setSender')->once()->with('foo@bar.baz', 'Foo');
-        $this->assertInstanceOf(Message::class, $this->message->sender('foo@bar.baz', 'Foo'));
+        $this->assertInstanceOf(Message::class, $message = $this->message->sender('foo@bar.baz', 'Foo'));
+        $this->assertEquals(new Address('foo@bar.baz', 'Foo'), $message->getSymfonyMessage()->getSender());
     }
 
     public function testReturnPathMethod()
     {
-        $this->swift->shouldReceive('setReturnPath')->once()->with('foo@bar.baz');
-        $this->assertInstanceOf(Message::class, $this->message->returnPath('foo@bar.baz'));
+        $this->assertInstanceOf(Message::class, $message = $this->message->returnPath('foo@bar.baz'));
+        $this->assertEquals(new Address('foo@bar.baz'), $message->getSymfonyMessage()->getReturnPath());
     }
 
     public function testToMethod()
     {
-        $this->swift->shouldReceive('addTo')->once()->with('foo@bar.baz', 'Foo');
-        $this->assertInstanceOf(Message::class, $this->message->to('foo@bar.baz', 'Foo', false));
+        $this->assertInstanceOf(Message::class, $message = $this->message->to('foo@bar.baz', 'Foo', false));
+        $this->assertEquals(new Address('foo@bar.baz', 'Foo'), $message->getSymfonyMessage()->getTo()[0]);
     }
 
     public function testToMethodWithOverride()
     {
-        $this->swift->shouldReceive('setTo')->once()->with('foo@bar.baz', 'Foo');
-        $this->assertInstanceOf(Message::class, $this->message->to('foo@bar.baz', 'Foo', true));
+        $this->assertInstanceOf(Message::class, $message = $this->message->to('foo@bar.baz', 'Foo', true));
+        $this->assertEquals(new Address('foo@bar.baz', 'Foo'), $message->getSymfonyMessage()->getTo()[0]);
     }
 
     public function testCcMethod()
     {
-        $this->swift->shouldReceive('addCc')->once()->with('foo@bar.baz', 'Foo');
-        $this->assertInstanceOf(Message::class, $this->message->cc('foo@bar.baz', 'Foo'));
+        $this->assertInstanceOf(Message::class, $message = $this->message->cc('foo@bar.baz', 'Foo'));
+        $this->assertEquals(new Address('foo@bar.baz', 'Foo'), $message->getSymfonyMessage()->getCc()[0]);
     }
 
     public function testBccMethod()
     {
-        $this->swift->shouldReceive('addBcc')->once()->with('foo@bar.baz', 'Foo');
-        $this->assertInstanceOf(Message::class, $this->message->bcc('foo@bar.baz', 'Foo'));
+        $this->assertInstanceOf(Message::class, $message = $this->message->bcc('foo@bar.baz', 'Foo'));
+        $this->assertEquals(new Address('foo@bar.baz', 'Foo'), $message->getSymfonyMessage()->getBcc()[0]);
     }
 
     public function testReplyToMethod()
     {
-        $this->swift->shouldReceive('addReplyTo')->once()->with('foo@bar.baz', 'Foo');
-        $this->assertInstanceOf(Message::class, $this->message->replyTo('foo@bar.baz', 'Foo'));
+        $this->assertInstanceOf(Message::class, $message = $this->message->replyTo('foo@bar.baz', 'Foo'));
+        $this->assertEquals(new Address('foo@bar.baz', 'Foo'), $message->getSymfonyMessage()->getReplyTo()[0]);
     }
 
     public function testSubjectMethod()
     {
-        $this->swift->shouldReceive('setSubject')->once()->with('foo');
-        $this->assertInstanceOf(Message::class, $this->message->subject('foo'));
+        $this->assertInstanceOf(Message::class, $message = $this->message->subject('foo'));
+        $this->assertEquals('foo', $message->getSymfonyMessage()->getSubject());
     }
 
     public function testPriorityMethod()
     {
-        $this->swift->shouldReceive('setPriority')->once()->with(1);
-        $this->assertInstanceOf(Message::class, $this->message->priority(1));
-    }
-
-    public function testGetSwiftMessageMethod()
-    {
-        $this->assertInstanceOf(Swift_Mime_Message::class, $this->message->getSwiftMessage());
+        $this->assertInstanceOf(Message::class, $me
9E12
ssage = $this->message->priority(1));
+        $this->assertEquals(1, $message->getSymfonyMessage()->getPriority());
     }
 
     public function testBasicAttachment()
     {
-        $swift = m::mock(stdClass::class);
-        $message = $this->getMockBuilder(Message::class)->onlyMethods(['createAttachmentFromPath'])->setConstructorArgs([$swift])->getMock();
-        $attachment = m::mock(stdClass::class);
-        $message->expects($this->once())->method('createAttachmentFromPath')->with($this->equalTo('foo.jpg'))->willReturn($attachment);
-        $swift->shouldReceive('attach')->once()->with($attachment);
-        $attachment->shouldReceive('setContentType')->once()->with('image/jpeg');
-        $attachment->shouldReceive('setFilename')->once()->with('bar.jpg');
-        $message->attach('foo.jpg', ['mime' => 'image/jpeg', 'as' => 'bar.jpg']);
+        $message = new Message(new Email());
+        $message->attach('foo.jpg', ['as' => 'foo.jpg', 'mime' => 'image/jpeg']);
     }
 
     public function testDataAttachment()
     {
-        $swift = m::mock(stdClass::class);
-        $message = $this->getMockBuilder(Message::class)->onlyMethods(['createAttachmentFromData'])->setConstructorArgs([$swift])->getMock();
-        $attachment = m::mock(stdClass::class);
-        $message->expects($this->once())->method('createAttachmentFromData')->with($this->equalTo('foo'), $this->equalTo('name'))->willReturn($attachment);
-        $swift->shouldReceive('attach')->once()->with($attachment);
-        $attachment->shouldReceive('setContentType')->once()->with('image/jpeg');
-        $message->attachData('foo', 'name', ['mime' => 'image/jpeg']);
+        $message = new Message(new Email());
+        $message->attachData('foo', 'foo.jpg', ['mime' => 'image/jpeg']);
+
+        $this->assertEquals('foo', $message->getSymfonyMessage()->getAttachments()[0]->getBody());
     }
 }
diff --git a/tests/Mail/MailableQueuedTest.php b/tests/Mail/MailableQueuedTest.php
@@ -15,7 +15,7 @@
 use Illuminate\Support\Testing\Fakes\QueueFake;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
-use Swift_Mailer;
+use Symfony\Component\Mailer\Transport\TransportInterface;
 
 class MailableQueuedTest extends TestCase
 {
@@ -91,7 +91,7 @@ public function testQueuedMailableWithAttachmentFromDiskSent()
 
     protected function getMocks()
     {
-        return ['smtp', m::mock(Factory::class), m::mock(Swift_Mailer::class)];
+        return ['smtp', m::mock(Factory::class), m::mock(TransportInterface::class)];
     }
 }