Cavemanon/piratepoet
8
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

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

@@ -5,7 +5,7 @@ namespace MailPoet\DynamicSegments\FreePluginConnectors;
use Codeception\Stub;
use Codeception\Stub\Expected;
use MailPoet\Models\DynamicSegment;
use PHPUnit_Framework_MockObject_MockObject as MockObject;
use PHPUnit\Framework\MockObject\MockObject;
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\Expected;
use MailPoet\Models\DynamicSegment;
use PHPUnit_Framework_MockObject_MockObject as MockObject;
use PHPUnit\Framework\MockObject\MockObject;
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\Segment;
use MailPoet\Models\Subscriber;
use PHPUnit_Framework_MockObject_MockObject as MockObject;
use PHPUnit\Framework\MockObject\MockObject;
class SendingNewslettersSubscribersFinderTest extends \MailPoetTest {

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

@@ -19,7 +19,7 @@ class FormDataMapperTest extends \MailPoetTest {
'description' => '',
'segmentType' => '',
];
$this->setExpectedException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException');
$this->expectException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException');
$this->mapper->mapDataToDB($data);
}
@@ -29,7 +29,7 @@ class FormDataMapperTest extends \MailPoetTest {
'description' => '',
'segmentType' => 'invalid',
];
$this->setExpectedException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException');
$this->expectException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException');
$this->mapper->mapDataToDB($data);
}
@@ -44,7 +44,7 @@ class FormDataMapperTest extends \MailPoetTest {
$this->assertInstanceOf('\MailPoet\Models\DynamicSegment', $segment);
$this->assertEquals('Name', $segment->name);
$this->assertEquals('Description', $segment->description);
$this->assertNull($segment->id);
$this->assertTrue($segment->id === null);
$this->assertCount(1, $segment->getFilters());
}
@@ -54,7 +54,7 @@ class FormDataMapperTest extends \MailPoetTest {
'description' => 'Description',
'segmentType' => 'woocommerce',
];
$this->setExpectedException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException');
$this->expectException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException');
$this->mapper->mapDataToDB($data);
}
@@ -70,7 +70,7 @@ class FormDataMapperTest extends \MailPoetTest {
$this->assertInstanceOf('\MailPoet\Models\DynamicSegment', $segment);
$this->assertEquals('Name', $segment->name);
$this->assertEquals('Description', $segment->description);
$this->assertNull($segment->id);
$this->assertTrue($segment->id === null);
$filters = $segment->getFilters();
$this->assertCount(1, $filters);
$this->assertInstanceOf('\MailPoet\DynamicSegments\Filters\WooCommerceCategory', $filters[0]);
@@ -88,7 +88,7 @@ class FormDataMapperTest extends \MailPoetTest {
$this->assertInstanceOf('\MailPoet\Models\DynamicSegment', $segment);
$this->assertEquals('Name', $segment->name);
$this->assertEquals('Description', $segment->description);
$this->assertNull($segment->id);
$this->assertTrue($segment->id === null);
$filters = $segment->getFilters();
$this->assertCount(1, $filters);
$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() {
$this->setExpectedException('InvalidArgumentException');
$this->expectException('InvalidArgumentException');
$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\RequirementsChecker;
use MailPoet\Models\DynamicSegment;
use PHPUnit\Framework\MockObject\MockObject;
class SubscribersCountTest extends \MailPoetTest {
/** @var RequirementsChecker|\PHPUnit_Framework_MockObject_MockObject */
/** @var RequirementsChecker|MockObject */
private $requirementChecker;
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\Models\DynamicSegment;
use MailPoet\Models\Subscriber;
use PHPUnit\Framework\MockObject\MockObject;
class SubscribersIdsTest extends \MailPoetTest {
private $editorsWpIds = [];
/** @var RequirementsChecker|\PHPUnit_Framework_MockObject_MockObject */
/** @var RequirementsChecker|MockObject */
private $requirementChecker;
public function _before() {