Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix PHPUnit 6 & Codeception\Verify incompatibilities

Browse Source 
[MAILPOET-2582]
This commit is contained in:
Jan Jakeš
2020-01-27 16:14:30 +01:00
committed by Jack Kitterhing
parent aa05ae4132
commit 835d8bc0af
34 changed files with 70 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/integration/Cron/Workers/InactiveSubscribersTest.php
View File

@@ -120,7 +120,8 @@ class InactiveSubscribersTest extends \MailPoetTest {
], $this);
$worker = new InactiveSubscribers($controllerMock, $this->settings);
$this->setExpectedException(\Exception::class, 'Maximum execution time has been reached.');
$this->expectException(\Exception::class);
$this->expectExceptionMessage('Maximum execution time has been reached.');
$worker->processTaskStrategy(ScheduledTask::createOrUpdate([]), microtime(true) - $this->cronHelper->getDaemonExecutionLimit());
}
}

2
tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php
View File

@@ -7,7 +7,7 @@ use MailPoet\Cron\Workers\KeyCheck\PremiumKeyCheck;
use MailPoet\Services\Bridge;
use MailPoet\Settings\SettingsController;
use MailPoet\Settings\SettingsRepository;
use PHPUnit_Framework_MockObject_MockObject as MockObject;
use PHPUnit\Framework\MockObject\MockObject;
class PremiumKeyCheckTest extends \MailPoetTest {
public $worker;

2
tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php
View File

@@ -9,7 +9,7 @@ use MailPoet\Mailer\Mailer;
use MailPoet\Services\Bridge;
use MailPoet\Settings\SettingsController;
use MailPoet\Settings\SettingsRepository;
use PHPUnit_Framework_MockObject_MockObject as MockObject;
use PHPUnit\Framework\MockObject\MockObject;
class SendingServiceKeyCheckTest extends \MailPoetTest {
public $worker;

2
tests/integration/Cron/Workers/WooCommerceOrdersTest.php
View File

@@ -12,7 +12,7 @@ use MailPoet\Models\StatisticsWooCommercePurchases;
use MailPoet\Statistics\Track\WooCommercePurchases;
use MailPoet\WooCommerce\Helper as WooCommerceHelper;
use MailPoetVendor\Idiorm\ORM;
use PHPUnit_Framework_MockObject_MockObject as MockObject;
use PHPUnit\Framework\MockObject\MockObject;
class WooCommerceOrdersTest extends \MailPoetTest {
/** @var MockObject */