Skip to content
Snippets Groups Projects
Commit 3b8a6dbc authored by Benjamin Franzke's avatar Benjamin Franzke
Browse files

[BUGFIX] Adapt SendEmailCommandTest for symfony/mailer

The tests produced a warning which didn't cause CI to abort,
but the test was actually skipped:

1) TYPO3\CMS\Core\Tests\Unit\Command\SendEmailCommandTest
     ::executeWillFlushTheQueue
   Trying to configure method "flushQueue" which cannot be configured
   because it does not exist, has not been specified, is final, or is
   static

Resolves: #88692
Related: #88643
Releases: master
Change-Id: I3077a011e19050986585e9c788f5db03d18595d3
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/61233


Tested-by: default avatarTYPO3com <noreply@typo3.com>
Tested-by: default avatarAndreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: default avatarAlexander Schnitzler <review.typo3.org@alexanderschnitzler.de>
Tested-by: default avatarBenjamin Franzke <bfr@qbus.de>
Reviewed-by: default avatarAndreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: default avatarAlexander Schnitzler <review.typo3.org@alexanderschnitzler.de>
Reviewed-by: default avatarBenjamin Franzke <bfr@qbus.de>
parent 3a2e6b2f
Branches
Tags
No related merge requests found
...@@ -15,8 +15,11 @@ namespace TYPO3\CMS\Core\Tests\Unit\Command; ...@@ -15,8 +15,11 @@ namespace TYPO3\CMS\Core\Tests\Unit\Command;
* The TYPO3 project - inspiring people to share! * The TYPO3 project - inspiring people to share!
*/ */
use Prophecy\Argument;
use Symfony\Component\Console\Tester\CommandTester; use Symfony\Component\Console\Tester\CommandTester;
use Symfony\Component\Mailer\Transport\TransportInterface;
use TYPO3\CMS\Core\Command\SendEmailCommand; use TYPO3\CMS\Core\Command\SendEmailCommand;
use TYPO3\CMS\Core\Mail\DelayedTransportInterface;
use TYPO3\CMS\Core\Mail\Mailer; use TYPO3\CMS\Core\Mail\Mailer;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase; use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
...@@ -30,16 +33,9 @@ class SendEmailCommandTest extends UnitTestCase ...@@ -30,16 +33,9 @@ class SendEmailCommandTest extends UnitTestCase
*/ */
public function executeWillFlushTheQueue() public function executeWillFlushTheQueue()
{ {
$realTransport = $this->getMockBuilder(\Swift_Transport::class)->getMock(); $delayedTransportProphecy = $this->prophesize(DelayedTransportInterface::class);
$delayedTransportProphecy->flushQueue(Argument::any())->willReturn(5);
$spool = $this->getMockBuilder(\Swift_Spool::class)->getMock(); $realTransportProphecy = $this->prophesize(TransportInterface::class);
$spool
->expects($this->once())
->method('flushQueue')
->with($realTransport)
->will($this->returnValue(5))
;
$spoolTransport = new \Swift_Transport_SpoolTransport(new \Swift_Events_SimpleEventDispatcher(), $spool);
$mailer = $this->getMockBuilder(Mailer::class) $mailer = $this->getMockBuilder(Mailer::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
...@@ -49,16 +45,16 @@ class SendEmailCommandTest extends UnitTestCase ...@@ -49,16 +45,16 @@ class SendEmailCommandTest extends UnitTestCase
$mailer $mailer
->expects($this->any()) ->expects($this->any())
->method('getTransport') ->method('getTransport')
->will($this->returnValue($spoolTransport)); ->will($this->returnValue($delayedTransportProphecy->reveal()));
$mailer $mailer
->expects($this->any()) ->expects($this->any())
->method('getRealTransport') ->method('getRealTransport')
->will($this->returnValue($realTransport)); ->will($this->returnValue($realTransportProphecy->reveal()));
/** @var SendEmailCommand|\PHPUnit_Framework_MockObject_MockObject $command */ /** @var SendEmailCommand|\PHPUnit_Framework_MockObject_MockObject $command */
$command = $this->getMockBuilder(SendEmailCommand::class) $command = $this->getMockBuilder(SendEmailCommand::class)
->setConstructorArgs(['swiftmailer:spool:send']) ->setConstructorArgs(['mailer:spool:send'])
->setMethods(['getMailer']) ->setMethods(['getMailer'])
->getMock(); ->getMock();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment