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

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

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

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

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