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

14
tasks/phpstan/phpstan-baseline-integration-tests.neon
View File

@ -186,22 +186,22 @@ parameters:
path: ../../tests/integration/API/JSON/v1/SettingsTest.php path: ../../tests/integration/API/JSON/v1/SettingsTest.php
- -
message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartPageVisitTrackerTest\\:\\:\\$wp \\(MailPoet\\\\WP\\\\Functions&PHPUnit_Framework_MockObject_MockObject\\) does not accept MailPoet\\\\WP\\\\Functions\\.$#" message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartPageVisitTrackerTest\\:\\:\\$wp \\(MailPoet\\\\WP\\\\Functions&PHPUnit\\\\Framework\\\\MockObject\\\\MockObject\\) does not accept MailPoet\\\\WP\\\\Functions\\.$#"
count: 1 count: 1
path: ../../tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartPageVisitTrackerTest.php path: ../../tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartPageVisitTrackerTest.php
- -
message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartTest\\:\\:\\$wp \\(MailPoet\\\\WP\\\\Functions&PHPUnit_Framework_MockObject_MockObject\\) does not accept MailPoet\\\\WP\\\\Functions\\.$#" message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartTest\\:\\:\\$wp \\(MailPoet\\\\WP\\\\Functions&PHPUnit\\\\Framework\\\\MockObject\\\\MockObject\\) does not accept MailPoet\\\\WP\\\\Functions\\.$#"
count: 1 count: 1
path: ../../tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php path: ../../tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php
- -
message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartTest\\:\\:\\$wooCommerceHelperMock \\(MailPoet\\\\WooCommerce\\\\Helper&PHPUnit_Framework_MockObject_MockObject\\) does not accept MailPoet\\\\WooCommerce\\\\Helper\\.$#" message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartTest\\:\\:\\$wooCommerceHelperMock \\(MailPoet\\\\WooCommerce\\\\Helper&PHPUnit\\\\Framework\\\\MockObject\\\\MockObject\\) does not accept MailPoet\\\\WooCommerce\\\\Helper\\.$#"
count: 1 count: 1
path: ../../tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php path: ../../tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php
- -
message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartTest\\:\\:\\$pageVisitTrackerMock \\(MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartPageVisitTracker&PHPUnit_Framework_MockObject_MockObject\\) does not accept MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartPageVisitTracker\\.$#" message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartTest\\:\\:\\$pageVisitTrackerMock \\(MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartPageVisitTracker&PHPUnit\\\\Framework\\\\MockObject\\\\MockObject\\) does not accept MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartPageVisitTracker\\.$#"
count: 1 count: 1
path: ../../tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php path: ../../tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php
@ -221,7 +221,7 @@ parameters:
path: ../../tests/integration/AutomaticEmails/WooCommerce/Events/FirstPurchaseTest.php path: ../../tests/integration/AutomaticEmails/WooCommerce/Events/FirstPurchaseTest.php
- -
message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\PurchasedInCategoryTest\\:\\:\\$woocommerceHelper \\(PHPUnit_Framework_MockObject_MockObject\\) does not accept MailPoet\\\\WooCommerce\\\\Helper\\.$#" message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\PurchasedInCategoryTest\\:\\:\\$woocommerceHelper \\(PHPUnit\\\\Framework\\\\MockObject\\\\MockObject\\) does not accept MailPoet\\\\WooCommerce\\\\Helper\\.$#"
count: 1 count: 1
path: ../../tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php path: ../../tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php
@ -476,12 +476,12 @@ parameters:
path: ../../tests/integration/DynamicSegments/Filters/UserRoleTest.php path: ../../tests/integration/DynamicSegments/Filters/UserRoleTest.php
- -
message: "#^Property MailPoet\\\\DynamicSegments\\\\FreePluginConnectors\\\\SendingNewslettersSubscribersFinderTest\\:\\:\\$singleSegmentLoader \\(MailPoet\\\\DynamicSegments\\\\Persistence\\\\Loading\\\\SingleSegmentLoader&PHPUnit_Framework_MockObject_MockObject\\) does not accept MailPoet\\\\DynamicSegments\\\\Persistence\\\\Loading\\\\SingleSegmentLoader\\.$#" message: "#^Property MailPoet\\\\DynamicSegments\\\\FreePluginConnectors\\\\SendingNewslettersSubscribersFinderTest\\:\\:\\$singleSegmentLoader \\(MailPoet\\\\DynamicSegments\\\\Persistence\\\\Loading\\\\SingleSegmentLoader&PHPUnit\\\\Framework\\\\MockObject\\\\MockObject\\) does not accept MailPoet\\\\DynamicSegments\\\\Persistence\\\\Loading\\\\SingleSegmentLoader\\.$#"
count: 1 count: 1
path: ../../tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php path: ../../tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php
- -
message: "#^Property MailPoet\\\\DynamicSegments\\\\FreePluginConnectors\\\\SendingNewslettersSubscribersFinderTest\\:\\:\\$subscribersIdsLoader \\(MailPoet\\\\DynamicSegments\\\\Persistence\\\\Loading\\\\SubscribersIds&PHPUnit_Framework_MockObject_MockObject\\) does not accept MailPoet\\\\DynamicSegments\\\\Persistence\\\\Loading\\\\SubscribersIds\\.$#" message: "#^Property MailPoet\\\\DynamicSegments\\\\FreePluginConnectors\\\\SendingNewslettersSubscribersFinderTest\\:\\:\\$subscribersIdsLoader \\(MailPoet\\\\DynamicSegments\\\\Persistence\\\\Loading\\\\SubscribersIds&PHPUnit\\\\Framework\\\\MockObject\\\\MockObject\\) does not accept MailPoet\\\\DynamicSegments\\\\Persistence\\\\Loading\\\\SubscribersIds\\.$#"
count: 1 count: 1
path: ../../tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php path: ../../tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php

2
tests/_support/CheckSkippedTestsExtension.php
View File

@ -13,7 +13,7 @@ class CheckSkippedTestsExtension extends Extension { // phpcs:ignore PSR1.Classe
$branch = getenv('CIRCLE_BRANCH'); $branch = getenv('CIRCLE_BRANCH');
$skipped = $e->getResult()->skipped(); $skipped = $e->getResult()->skipped();
if (in_array($branch, ['master', 'release']) && (count($skipped) !== 0)) { if (in_array($branch, ['master', 'release']) && (count($skipped) !== 0)) {
throw new PHPUnit_Framework_ExpectationFailedException("Failed, Cannot skip tests on branch $branch."); throw new \PHPUnit\Framework\ExpectationFailedException("Failed, Cannot skip tests on branch $branch.");
} }
} }
} }

3
tests/acceptance/ManageSubscriptionLinkCest.php
View File

@ -4,6 +4,7 @@ namespace MailPoet\Test\Acceptance;
use Codeception\Util\Locator; use Codeception\Util\Locator;
use MailPoet\Test\DataFactories\Settings; use MailPoet\Test\DataFactories\Settings;
use PHPUnit\Framework\Exception;
class ManageSubscriptionLinkCest { class ManageSubscriptionLinkCest {
@ -117,7 +118,7 @@ class ManageSubscriptionLinkCest {
$i->waitForListingItemsToLoad(); $i->waitForListingItemsToLoad();
$i->see('Sent to 1 of 1'); $i->see('Sent to 1 of 1');
return; return;
} catch (\PHPUnit_Framework_Exception $e) { } catch (Exception $e) {
continue; continue;
} }
} }

4
tests/acceptance/ReinstallFromScratchCest.php
View File

@ -7,7 +7,7 @@ use MailPoet\Test\DataFactories\Newsletter;
use MailPoet\Test\DataFactories\Segment; use MailPoet\Test\DataFactories\Segment;
use MailPoet\Test\DataFactories\Settings; use MailPoet\Test\DataFactories\Settings;
use MailPoet\Test\DataFactories\Subscriber; use MailPoet\Test\DataFactories\Subscriber;
use PHPUnit_Framework_Assert as Asserts; use PHPUnit\Framework\Assert;
class ReinstallFromScratchCest { class ReinstallFromScratchCest {
@ -58,6 +58,6 @@ class ReinstallFromScratchCest {
$i->waitForText('admin', 30, '.mailpoet_listing_table'); $i->waitForText('admin', 30, '.mailpoet_listing_table');
$wpUsersCount = count_users(); $wpUsersCount = count_users();
$subscribersCount = (int)$i->grabTextFrom('.displaying-num'); $subscribersCount = (int)$i->grabTextFrom('.displaying-num');
Asserts::assertEquals($wpUsersCount['total_users'], $subscribersCount); Assert::assertEquals($wpUsersCount['total_users'], $subscribersCount);
} }
} }

3
tests/acceptance/SettingsInactiveSubscribersChangeCest.php
View File

@ -6,6 +6,7 @@ use MailPoet\Test\DataFactories\ScheduledTask;
use MailPoet\Test\DataFactories\Segment; use MailPoet\Test\DataFactories\Segment;
use MailPoet\Test\DataFactories\Settings; use MailPoet\Test\DataFactories\Settings;
use MailPoet\Test\DataFactories\Subscriber; use MailPoet\Test\DataFactories\Subscriber;
use PHPUnit\Framework\Exception;
class SettingsInactiveSubscribersChangeCest { class SettingsInactiveSubscribersChangeCest {
@ -49,7 +50,7 @@ class SettingsInactiveSubscribersChangeCest {
$i->waitForListingItemsToLoad(); $i->waitForListingItemsToLoad();
$i->see('Inactive (0)'); $i->see('Inactive (0)');
return; return;
} catch (\PHPUnit_Framework_Exception $e) { } catch (Exception $e) {
continue; continue;
} }
} }

3
tests/acceptance/WooCommerceListImportPageCest.php
View File

@ -6,6 +6,7 @@ use MailPoet\Test\DataFactories\ScheduledTask;
use MailPoet\Test\DataFactories\Settings; use MailPoet\Test\DataFactories\Settings;
use MailPoet\Test\DataFactories\WooCommerceCustomer; use MailPoet\Test\DataFactories\WooCommerceCustomer;
use MailPoet\Test\DataFactories\WooCommerceOrder; use MailPoet\Test\DataFactories\WooCommerceOrder;
use PHPUnit\Framework\Exception;
class WooCommerceListImportPageCest { class WooCommerceListImportPageCest {
@ -58,7 +59,7 @@ class WooCommerceListImportPageCest {
$i->reloadPage(); $i->reloadPage();
$i->see($guestUserData['email']); $i->see($guestUserData['email']);
return; return;
} catch (\PHPUnit_Framework_Exception $e) { } catch (Exception $e) {
continue; continue;
} }
} }

7
tests/integration/API/MP/APITest.php
View File

@ -502,7 +502,7 @@ class APITest extends \MailPoetTest {
'email' => 'test@example.com', 'email' => 'test@example.com',
]; ];
$this->setExpectedException('Exception'); $this->expectException('Exception');
$this->getApi()->addSubscriber($subscriber); $this->getApi()->addSubscriber($subscriber);
} }
@ -568,7 +568,7 @@ class APITest extends \MailPoetTest {
'email' => 'test@example.com', 'email' => 'test@example.com',
]; ];
$segments = [$segment->id()]; $segments = [$segment->id()];
$this->setExpectedException('\Exception'); $this->expectException('\Exception');
$API->addSubscriber($subscriber, $segments, ['schedule_welcome_email' => true, 'send_confirmation_email' => false]); $API->addSubscriber($subscriber, $segments, ['schedule_welcome_email' => true, 'send_confirmation_email' => false]);
} }
@ -649,7 +649,8 @@ class APITest extends \MailPoetTest {
$subscriber = [ $subscriber = [
'email' => 'test@example.com', 'email' => 'test@example.com',
]; ];
$this->setExpectedException('\Exception', 'Subscriber added to lists, but confirmation email failed to send: big error'); $this->expectException('\Exception');
$this->expectExceptionMessage('Subscriber added to lists, but confirmation email failed to send: big error');
$API->addSubscriber($subscriber, [$segment->id], ['send_confirmation_email' => true]); $API->addSubscriber($subscriber, [$segment->id], ['send_confirmation_email' => true]);
} }

2
tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php
View File

@ -17,7 +17,7 @@ use MailPoet\Tasks\Sending;
use MailPoet\WooCommerce\Helper as WCHelper; use MailPoet\WooCommerce\Helper as WCHelper;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
use MailPoetVendor\Idiorm\ORM; use MailPoetVendor\Idiorm\ORM;
use PHPUnit_Framework_MockObject_MockObject as MockObject; use PHPUnit\Framework\MockObject\MockObject;
class PurchasedInCategoryTest extends \MailPoetTest { class PurchasedInCategoryTest extends \MailPoetTest {

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

@ -120,7 +120,8 @@ class InactiveSubscribersTest extends \MailPoetTest {
], $this); ], $this);
$worker = new InactiveSubscribers($controllerMock, $this->settings); $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()); $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\Services\Bridge;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\Settings\SettingsRepository; use MailPoet\Settings\SettingsRepository;
use PHPUnit_Framework_MockObject_MockObject as MockObject; use PHPUnit\Framework\MockObject\MockObject;
class PremiumKeyCheckTest extends \MailPoetTest { class PremiumKeyCheckTest extends \MailPoetTest {
public $worker; 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\Services\Bridge;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\Settings\SettingsRepository; use MailPoet\Settings\SettingsRepository;
use PHPUnit_Framework_MockObject_MockObject as MockObject; use PHPUnit\Framework\MockObject\MockObject;
class SendingServiceKeyCheckTest extends \MailPoetTest { class SendingServiceKeyCheckTest extends \MailPoetTest {
public $worker; 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\Statistics\Track\WooCommercePurchases;
use MailPoet\WooCommerce\Helper as WooCommerceHelper; use MailPoet\WooCommerce\Helper as WooCommerceHelper;
use MailPoetVendor\Idiorm\ORM; use MailPoetVendor\Idiorm\ORM;
use PHPUnit_Framework_MockObject_MockObject as MockObject; use PHPUnit\Framework\MockObject\MockObject;
class WooCommerceOrdersTest extends \MailPoetTest { class WooCommerceOrdersTest extends \MailPoetTest {
/** @var MockObject */ /** @var MockObject */

2
tests/integration/DynamicSegments/FreePluginConnectors/AddToNewslettersSegmentsTest.php
View File

@ -5,7 +5,7 @@ namespace MailPoet\DynamicSegments\FreePluginConnectors;
use Codeception\Stub; use Codeception\Stub;
use Codeception\Stub\Expected; use Codeception\Stub\Expected;
use MailPoet\Models\DynamicSegment; use MailPoet\Models\DynamicSegment;
use PHPUnit_Framework_MockObject_MockObject as MockObject; use PHPUnit\Framework\MockObject\MockObject;
class AddToNewslettersSegmentsTest extends \MailPoetTest { class AddToNewslettersSegmentsTest extends \MailPoetTest {

2
tests/integration/DynamicSegments/FreePluginConnectors/AddToSubscribersFiltersTest.php
View File

@ -5,7 +5,7 @@ namespace MailPoet\DynamicSegments\FreePluginConnectors;
use Codeception\Stub; use Codeception\Stub;
use Codeception\Stub\Expected; use Codeception\Stub\Expected;
use MailPoet\Models\DynamicSegment; use MailPoet\Models\DynamicSegment;
use PHPUnit_Framework_MockObject_MockObject as MockObject; use PHPUnit\Framework\MockObject\MockObject;
class AddToSubscribersFiltersTest extends \MailPoetTest { class AddToSubscribersFiltersTest extends \MailPoetTest {

2
tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php
View File

@ -8,7 +8,7 @@ use MailPoet\DynamicSegments\Persistence\Loading\SubscribersIds;
use MailPoet\Models\DynamicSegment; use MailPoet\Models\DynamicSegment;
use MailPoet\Models\Segment; use MailPoet\Models\Segment;
use MailPoet\Models\Subscriber; use MailPoet\Models\Subscriber;
use PHPUnit_Framework_MockObject_MockObject as MockObject; use PHPUnit\Framework\MockObject\MockObject;
class SendingNewslettersSubscribersFinderTest extends \MailPoetTest { class SendingNewslettersSubscribersFinderTest extends \MailPoetTest {

12
tests/integration/DynamicSegments/Mappers/FormDataMapperTest.php
View File

@ -19,7 +19,7 @@ class FormDataMapperTest extends \MailPoetTest {
'description' => '', 'description' => '',
'segmentType' => '', 'segmentType' => '',
]; ];
$this->setExpectedException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException'); $this->expectException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException');
$this->mapper->mapDataToDB($data); $this->mapper->mapDataToDB($data);
} }
@ -29,7 +29,7 @@ class FormDataMapperTest extends \MailPoetTest {
'description' => '', 'description' => '',
'segmentType' => 'invalid', 'segmentType' => 'invalid',
]; ];
$this->setExpectedException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException'); $this->expectException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException');
$this->mapper->mapDataToDB($data); $this->mapper->mapDataToDB($data);
} }
@ -44,7 +44,7 @@ class FormDataMapperTest extends \MailPoetTest {
$this->assertInstanceOf('\MailPoet\Models\DynamicSegment', $segment); $this->assertInstanceOf('\MailPoet\Models\DynamicSegment', $segment);
$this->assertEquals('Name', $segment->name); $this->assertEquals('Name', $segment->name);
$this->assertEquals('Description', $segment->description); $this->assertEquals('Description', $segment->description);
$this->assertNull($segment->id); $this->assertTrue($segment->id === null);
$this->assertCount(1, $segment->getFilters()); $this->assertCount(1, $segment->getFilters());
} }
@ -54,7 +54,7 @@ class FormDataMapperTest extends \MailPoetTest {
'description' => 'Description', 'description' => 'Description',
'segmentType' => 'woocommerce', 'segmentType' => 'woocommerce',
]; ];
$this->setExpectedException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException'); $this->expectException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException');
$this->mapper->mapDataToDB($data); $this->mapper->mapDataToDB($data);
} }
@ -70,7 +70,7 @@ class FormDataMapperTest extends \MailPoetTest {
$this->assertInstanceOf('\MailPoet\Models\DynamicSegment', $segment); $this->assertInstanceOf('\MailPoet\Models\DynamicSegment', $segment);
$this->assertEquals('Name', $segment->name); $this->assertEquals('Name', $segment->name);
$this->assertEquals('Description', $segment->description); $this->assertEquals('Description', $segment->description);
$this->assertNull($segment->id); $this->assertTrue($segment->id === null);
$filters = $segment->getFilters(); $filters = $segment->getFilters();
$this->assertCount(1, $filters); $this->assertCount(1, $filters);
$this->assertInstanceOf('\MailPoet\DynamicSegments\Filters\WooCommerceCategory', $filters[0]); $this->assertInstanceOf('\MailPoet\DynamicSegments\Filters\WooCommerceCategory', $filters[0]);
@ -88,7 +88,7 @@ class FormDataMapperTest extends \MailPoetTest {
$this->assertInstanceOf('\MailPoet\Models\DynamicSegment', $segment); $this->assertInstanceOf('\MailPoet\Models\DynamicSegment', $segment);
$this->assertEquals('Name', $segment->name); $this->assertEquals('Name', $segment->name);
$this->assertEquals('Description', $segment->description); $this->assertEquals('Description', $segment->description);
$this->assertNull($segment->id); $this->assertTrue($segment->id === null);
$filters = $segment->getFilters(); $filters = $segment->getFilters();
$this->assertCount(1, $filters); $this->assertCount(1, $filters);
$this->assertInstanceOf('\MailPoet\DynamicSegments\Filters\WooCommerceProduct', $filters[0]); $this->assertInstanceOf('\MailPoet\DynamicSegments\Filters\WooCommerceProduct', $filters[0]);

2
tests/integration/DynamicSegments/Persistence/Loading/SingleSegmentLoaderTest.php
View File

@ -38,7 +38,7 @@ class SingleSegmentLoaderTest extends \MailPoetTest {
} }
public function testItThrowsForUnknownSegment() { public function testItThrowsForUnknownSegment() {
$this->setExpectedException('InvalidArgumentException'); $this->expectException('InvalidArgumentException');
$this->loader->load($this->segment->id + 11564564); $this->loader->load($this->segment->id + 11564564);
} }

3
tests/integration/DynamicSegments/Persistence/Loading/SubscribersCountTest.php
View File

@ -7,10 +7,11 @@ require_once(ABSPATH . 'wp-admin/includes/user.php');
use MailPoet\DynamicSegments\Filters\UserRole; use MailPoet\DynamicSegments\Filters\UserRole;
use MailPoet\DynamicSegments\RequirementsChecker; use MailPoet\DynamicSegments\RequirementsChecker;
use MailPoet\Models\DynamicSegment; use MailPoet\Models\DynamicSegment;
use PHPUnit\Framework\MockObject\MockObject;
class SubscribersCountTest extends \MailPoetTest { class SubscribersCountTest extends \MailPoetTest {
/** @var RequirementsChecker|\PHPUnit_Framework_MockObject_MockObject */ /** @var RequirementsChecker|MockObject */
private $requirementChecker; private $requirementChecker;
public function _before() { public function _before() {

3
tests/integration/DynamicSegments/Persistence/Loading/SubscribersIdsTest.php
View File

@ -8,12 +8,13 @@ use MailPoet\DynamicSegments\Filters\UserRole;
use MailPoet\DynamicSegments\RequirementsChecker; use MailPoet\DynamicSegments\RequirementsChecker;
use MailPoet\Models\DynamicSegment; use MailPoet\Models\DynamicSegment;
use MailPoet\Models\Subscriber; use MailPoet\Models\Subscriber;
use PHPUnit\Framework\MockObject\MockObject;
class SubscribersIdsTest extends \MailPoetTest { class SubscribersIdsTest extends \MailPoetTest {
private $editorsWpIds = []; private $editorsWpIds = [];
/** @var RequirementsChecker|\PHPUnit_Framework_MockObject_MockObject */ /** @var RequirementsChecker|MockObject */
private $requirementChecker; private $requirementChecker;
public function _before() { public function _before() {

4
tests/integration/Mailer/MailerLogTest.php
View File

@ -160,7 +160,7 @@ class MailerLogTest extends \MailPoetTest {
expect($mailerLog['retry_at'])->null(); expect($mailerLog['retry_at'])->null();
expect($mailerLog['error'])->null(); expect($mailerLog['error'])->null();
// retry attempt should be incremented, error logged, retry attempt scheduled // retry attempt should be incremented, error logged, retry attempt scheduled
$this->setExpectedException('\Exception'); $this->expectException('\Exception');
MailerLog::processError($operation = 'send', $error = 'email rejected'); MailerLog::processError($operation = 'send', $error = 'email rejected');
$mailerLog = MailerLog::getMailerLog(); $mailerLog = MailerLog::getMailerLog();
expect($mailerLog['retry_attempt'])->equals(1); expect($mailerLog['retry_attempt'])->equals(1);
@ -178,7 +178,7 @@ class MailerLogTest extends \MailPoetTest {
expect($mailerLog['retry_attempt'])->null(); expect($mailerLog['retry_attempt'])->null();
expect($mailerLog['retry_at'])->null(); expect($mailerLog['retry_at'])->null();
expect($mailerLog['error'])->null(); expect($mailerLog['error'])->null();
$this->setExpectedException('\Exception'); $this->expectException('\Exception');
MailerLog::processNonBlockingError($operation = 'send', $error = 'email rejected'); MailerLog::processNonBlockingError($operation = 'send', $error = 'email rejected');
$mailerLog = MailerLog::getMailerLog(); $mailerLog = MailerLog::getMailerLog();
expect($mailerLog['retry_attempt'])->equals(1); expect($mailerLog['retry_attempt'])->equals(1);

2
tests/integration/Newsletter/Editor/PostContentTransformerTest.php
View File

@ -5,7 +5,7 @@ namespace MailPoet\Test\Newsletter\Editor;
use Codeception\Stub\Expected; use Codeception\Stub\Expected;
use MailPoet\Newsletter\Editor\PostTransformer; use MailPoet\Newsletter\Editor\PostTransformer;
use MailPoet\Newsletter\Editor\PostTransformerContentsExtractor; use MailPoet\Newsletter\Editor\PostTransformerContentsExtractor;
use PHPUnit_Framework_MockObject_MockObject as MockObject; use PHPUnit\Framework\MockObject\MockObject;
class PostContentTransformerTest extends \MailPoetTest { class PostContentTransformerTest extends \MailPoetTest {
/** @var array */ /** @var array */

6
tests/integration/Segments/BulkActionTest.php
View File

@ -8,7 +8,7 @@ use MailPoet\Models\Subscriber;
use MailPoet\Models\SubscriberSegment; use MailPoet\Models\SubscriberSegment;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
use MailPoetVendor\Idiorm\ORM; use MailPoetVendor\Idiorm\ORM;
use PHPUnit_Framework_MockObject_MockObject as MockObject; use PHPUnit\Framework\MockObject\MockObject;
require_once('SubscribersBulkActionHandlerMock.php'); require_once('SubscribersBulkActionHandlerMock.php');
@ -57,7 +57,7 @@ class BulkActionTest extends \MailPoetTest {
public function testBulkActionWithoutSegment() { public function testBulkActionWithoutSegment() {
$handler = new BulkAction([]); $handler = new BulkAction([]);
$this->setExpectedException('InvalidArgumentException'); $this->expectException('InvalidArgumentException');
$handler->apply(); $handler->apply();
} }
@ -84,7 +84,7 @@ class BulkActionTest extends \MailPoetTest {
'listing' => ['filter' => ['segment' => $this->segment2->id]], 'listing' => ['filter' => ['segment' => $this->segment2->id]],
'action' => 'trash', 'action' => 'trash',
]); ]);
$this->setExpectedException('InvalidArgumentException'); $this->expectException('InvalidArgumentException');
remove_all_filters('mailpoet_subscribers_in_segment_apply_bulk_action_handlers'); remove_all_filters('mailpoet_subscribers_in_segment_apply_bulk_action_handlers');
$handler->apply(); $handler->apply();
} }

2
tests/integration/Segments/SubscribersFinderTest.php
View File

@ -13,7 +13,7 @@ use MailPoet\Models\SubscriberSegment;
use MailPoet\Tasks\Sending as SendingTask; use MailPoet\Tasks\Sending as SendingTask;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
use MailPoetVendor\Idiorm\ORM; use MailPoetVendor\Idiorm\ORM;
use PHPUnit_Framework_MockObject_MockObject as MockObject; use PHPUnit\Framework\MockObject\MockObject;
class SubscribersFinderTest extends \MailPoetTest { class SubscribersFinderTest extends \MailPoetTest {
public $sending; public $sending;

6
tests/integration/Segments/SubscribersListingsTest.php
View File

@ -11,7 +11,7 @@ use MailPoet\Models\Subscriber;
use MailPoet\Models\SubscriberSegment; use MailPoet\Models\SubscriberSegment;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
use MailPoetVendor\Idiorm\ORM; use MailPoetVendor\Idiorm\ORM;
use PHPUnit_Framework_MockObject_MockObject as MockObject; use PHPUnit\Framework\MockObject\MockObject;
class SubscribersListingsTest extends \MailPoetTest { class SubscribersListingsTest extends \MailPoetTest {
public $subscriber2; public $subscriber2;
@ -61,7 +61,7 @@ class SubscribersListingsTest extends \MailPoetTest {
} }
public function testTryToGetListingsWithoutPassingSegment() { public function testTryToGetListingsWithoutPassingSegment() {
$this->setExpectedException('InvalidArgumentException'); $this->expectException('InvalidArgumentException');
$this->finder->getListingsInSegment([]); $this->finder->getListingsInSegment([]);
} }
@ -93,7 +93,7 @@ class SubscribersListingsTest extends \MailPoetTest {
} }
public function testTryToGetListingsForSegmentWithoutHandler() { public function testTryToGetListingsForSegmentWithoutHandler() {
$this->setExpectedException('InvalidArgumentException'); $this->expectException('InvalidArgumentException');
remove_all_filters('mailpoet_get_subscribers_listings_in_segment_handlers'); remove_all_filters('mailpoet_get_subscribers_listings_in_segment_handlers');
$this->finder->getListingsInSegment(['filter' => ['segment' => $this->segment2->id]]); $this->finder->getListingsInSegment(['filter' => ['segment' => $this->segment2->id]]);
} }

2
tests/integration/Services/BridgeTest.php
View File

@ -10,7 +10,7 @@ use MailPoet\Services\Bridge\BridgeTestMockAPI as MockAPI;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\Settings\SettingsRepository; use MailPoet\Settings\SettingsRepository;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
use PHPUnit_Framework_MockObject_MockObject as MockObject; use PHPUnit\Framework\MockObject\MockObject;
require_once('BridgeTestMockAPI.php'); require_once('BridgeTestMockAPI.php');

4
tests/integration/Statistics/Track/WooCommercePurchasesTest.php
View File

@ -14,7 +14,7 @@ use MailPoet\Tasks\Sending;
use MailPoet\Util\Cookies; use MailPoet\Util\Cookies;
use MailPoet\WooCommerce\Helper as WooCommerceHelper; use MailPoet\WooCommerce\Helper as WooCommerceHelper;
use MailPoetVendor\Idiorm\ORM; use MailPoetVendor\Idiorm\ORM;
use PHPUnit_Framework_MockObject_MockObject; use PHPUnit\Framework\MockObject\MockObject;
use WC_Order; use WC_Order;
class WooCommercePurchasesTest extends \MailPoetTest { class WooCommercePurchasesTest extends \MailPoetTest {
@ -321,7 +321,7 @@ class WooCommercePurchasesTest extends \MailPoetTest {
return $click->save(); return $click->save();
} }
private function createWooCommerceHelperMock(PHPUnit_Framework_MockObject_MockObject $orderMock) { private function createWooCommerceHelperMock(MockObject $orderMock) {
$mock = $this->createMock(WooCommerceHelper::class); $mock = $this->createMock(WooCommerceHelper::class);
$mock->method('wcGetOrder')->willReturn($orderMock); $mock->method('wcGetOrder')->willReturn($orderMock);
return $mock; return $mock;

6
tests/integration/Subscribers/RequiredCustomFieldValidatorTest.php
View File

@ -22,7 +22,7 @@ class RequiredCustomFieldValidatorTest extends \MailPoetTest {
public function testItValidatesDataWithoutCustomField() { public function testItValidatesDataWithoutCustomField() {
$validator = new RequiredCustomFieldValidator(); $validator = new RequiredCustomFieldValidator();
$this->setExpectedException('Exception'); $this->expectException('Exception');
$validator->validate([]); $validator->validate([]);
} }
@ -38,13 +38,13 @@ class RequiredCustomFieldValidatorTest extends \MailPoetTest {
public function testItValidatesDataWithEmptyCustomField() { public function testItValidatesDataWithEmptyCustomField() {
$validator = new RequiredCustomFieldValidator(); $validator = new RequiredCustomFieldValidator();
$this->setExpectedException('Exception'); $this->expectException('Exception');
$validator->validate([$this->customField->id() => '']); $validator->validate([$this->customField->id() => '']);
} }
public function testItValidatesDataWithEmptyCustomFieldAsCFId() { public function testItValidatesDataWithEmptyCustomFieldAsCFId() {
$validator = new RequiredCustomFieldValidator(); $validator = new RequiredCustomFieldValidator();
$this->setExpectedException('Exception'); $this->expectException('Exception');
$validator->validate(['cf_' . $this->customField->id() => '']); $validator->validate(['cf_' . $this->customField->id() => '']);
} }

2
tests/integration/Subscribers/SourceTest.php
View File

@ -18,7 +18,7 @@ class SourceTest extends \MailPoetTest {
$subscriber = Subscriber::createOrUpdate([ $subscriber = Subscriber::createOrUpdate([
'source' => Source::UNKNOWN, 'source' => Source::UNKNOWN,
]); ]);
$this->setExpectedException('\InvalidArgumentException'); $this->expectException('\InvalidArgumentException');
Source::setSource($subscriber, 'invalid source'); Source::setSource($subscriber, 'invalid source');
} }

8
tests/integration/WooCommerce/TransactionalEmailsTest.php
View File

@ -224,19 +224,19 @@ class TransactionalEmailsTest extends \MailPoetTest {
); );
$transactionalEmails->useTemplateForWoocommerceEmails(); $transactionalEmails->useTemplateForWoocommerceEmails();
expect($addedActions)->count(1); expect($addedActions)->count(1);
expect($addedActions['woocommerce_init'])->isCallable(); expect($addedActions['woocommerce_init'])->callable();
$addedActions['woocommerce_init'](); $addedActions['woocommerce_init']();
expect($removedActions)->count(2); expect($removedActions)->count(2);
expect($addedActions)->count(4); expect($addedActions)->count(4);
expect($addedActions['woocommerce_email_header'])->isCallable(); expect($addedActions['woocommerce_email_header'])->callable();
ob_start(); ob_start();
$addedActions['woocommerce_email_header']('heading text'); $addedActions['woocommerce_email_header']('heading text');
expect(ob_get_clean())->equals('HTML before content with heading text'); expect(ob_get_clean())->equals('HTML before content with heading text');
expect($addedActions['woocommerce_email_footer'])->isCallable(); expect($addedActions['woocommerce_email_footer'])->callable();
ob_start(); ob_start();
$addedActions['woocommerce_email_footer'](); $addedActions['woocommerce_email_footer']();
expect(ob_get_clean())->equals('HTML after content'); expect(ob_get_clean())->equals('HTML after content');
expect($addedActions['woocommerce_email_styles'])->isCallable(); expect($addedActions['woocommerce_email_styles'])->callable();
expect($addedActions['woocommerce_email_styles']('some css'))->equals('prefixed some css'); expect($addedActions['woocommerce_email_styles']('some css'))->equals('prefixed some css');
} }

7
tests/unit/Cron/Workers/StatsNotifications/SchedulerTest.php
View File

@ -7,19 +7,20 @@ use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Entities\StatsNotificationEntity; use MailPoet\Entities\StatsNotificationEntity;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoetVendor\Doctrine\ORM\EntityManager; use MailPoetVendor\Doctrine\ORM\EntityManager;
use PHPUnit\Framework\MockObject\MockObject;
class SchedulerTest extends \MailPoetUnitTest { class SchedulerTest extends \MailPoetUnitTest {
/** @var Scheduler */ /** @var Scheduler */
private $statsNotifications; private $statsNotifications;
/** @var SettingsController|\PHPUnit_Framework_MockObject_MockObject */ /** @var SettingsController|MockObject */
private $settings; private $settings;
/** @var EntityManager|\PHPUnit_Framework_MockObject_MockObject */ /** @var EntityManager|MockObject */
private $entityManager; private $entityManager;
/** @var StatsNotificationsRepository|\PHPUnit_Framework_MockObject_MockObject */ /** @var StatsNotificationsRepository|MockObject */
private $repository; private $repository;
public function _before() { public function _before() {

3
tests/unit/DynamicSegments/RequirementsCheckerTest.php
View File

@ -6,10 +6,11 @@ use MailPoet\DynamicSegments\Filters\EmailAction;
use MailPoet\DynamicSegments\Filters\WooCommerceCategory; use MailPoet\DynamicSegments\Filters\WooCommerceCategory;
use MailPoet\Models\DynamicSegment; use MailPoet\Models\DynamicSegment;
use MailPoet\WooCommerce\Helper; use MailPoet\WooCommerce\Helper;
use PHPUnit\Framework\MockObject\MockObject;
class RequirementsCheckerTest extends \MailPoetUnitTest { class RequirementsCheckerTest extends \MailPoetUnitTest {
/** @var Helper|\PHPUnit_Framework_MockObject_MockObject */ /** @var Helper|MockObject */
private $woocommerceHelper; private $woocommerceHelper;
/** @var RequirementsChecker */ /** @var RequirementsChecker */

2
tests/unit/Logging/LoggerFactoryTest.php
View File

@ -4,7 +4,7 @@ namespace MailPoet\Logging;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoetVendor\Monolog\Handler\AbstractHandler; use MailPoetVendor\Monolog\Handler\AbstractHandler;
use PHPUnit_Framework_MockObject_MockObject as MockObject; use PHPUnit\Framework\MockObject\MockObject;
class LoggerFactoryTest extends \MailPoetUnitTest { class LoggerFactoryTest extends \MailPoetUnitTest {

2
tests/unit/Referrals/ReferralDetectorTest.php
View File

@ -4,7 +4,7 @@ namespace MailPoet\Referrals;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
use PHPUnit_Framework_MockObject_MockObject as MockObject; use PHPUnit\Framework\MockObject\MockObject;
class ReferralDetectorTest extends \MailPoetUnitTest { class ReferralDetectorTest extends \MailPoetUnitTest {

2
tests/unit/_bootstrap.php
View File

@ -7,7 +7,7 @@ if (!function_exists('__')) {
} }
// Fix for mocking WPFunctions // Fix for mocking WPFunctions
// [PHPUnit_Framework_Exception] Use of undefined constant OBJECT - assumed 'OBJECT' (this will throw an Error in a future version of PHP) // [PHPUnit\Framework\Exception] Use of undefined constant OBJECT - assumed 'OBJECT' (this will throw an Error in a future version of PHP)
if (!defined('OBJECT')) { if (!defined('OBJECT')) {
define( 'OBJECT', 'OBJECT' ); define( 'OBJECT', 'OBJECT' );
} }