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

Replace expect()->contains() with verify()->arrayContains()

Browse Source 
codeception/verify 2.1 removed support for expect()->contains() so we need
to replace it with verify()->arrayContains().

[MAILPOET-5664]
This commit is contained in:
Rodrigo Primo
2023-10-18 16:49:43 -03:00
committed by David Remer
parent fa9236d8c9
commit e4f0b89032
12 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mailpoet/tests/integration/API/JSON/v1/SubscribersTest.php
View File

@ -401,7 +401,7 @@ class SubscribersTest extends \MailPoetTest {
'segment' => $dynamicSegment->getId(), 'segment' => $dynamicSegment->getId(),
], ],
]); ]);
expect($response->meta['filters']['segment'])->contains(['label' => 'Dynamic (1)', 'value' => $dynamicSegment->getId()]); verify($response->meta['filters']['segment'])->arrayContains(['label' => 'Dynamic (1)', 'value' => $dynamicSegment->getId()]);
$this->tester->deleteWordPressUser($wpUserEmail); $this->tester->deleteWordPressUser($wpUserEmail);
} }

10
mailpoet/tests/integration/API/MP/CustomFieldsTest.php
View File

@ -23,7 +23,7 @@ class CustomFieldsTest extends \MailPoetTest {
public function testItReturnsDefaultSubscriberFields() { public function testItReturnsDefaultSubscriberFields() {
$response = $this->api->getSubscriberFields(); $response = $this->api->getSubscriberFields();
expect($response)->contains([ verify($response)->arrayContains([
'id' => 'email', 'id' => 'email',
'name' => __('Email', 'mailpoet'), 'name' => __('Email', 'mailpoet'),
'type' => 'text', 'type' => 'text',
@ -31,7 +31,7 @@ class CustomFieldsTest extends \MailPoetTest {
'required' => '1', 'required' => '1',
], ],
]); ]);
expect($response)->contains([ verify($response)->arrayContains([
'id' => 'first_name', 'id' => 'first_name',
'name' => __('First name', 'mailpoet'), 'name' => __('First name', 'mailpoet'),
'type' => 'text', 'type' => 'text',
@ -39,7 +39,7 @@ class CustomFieldsTest extends \MailPoetTest {
'required' => '', 'required' => '',
], ],
]); ]);
expect($response)->contains([ verify($response)->arrayContains([
'id' => 'last_name', 'id' => 'last_name',
'name' => __('Last name', 'mailpoet'), 'name' => __('Last name', 'mailpoet'),
'type' => 'text', 'type' => 'text',
@ -61,7 +61,7 @@ class CustomFieldsTest extends \MailPoetTest {
'params' => ['required' => ''], 'params' => ['required' => ''],
]); ]);
$response = $this->api->getSubscriberFields(); $response = $this->api->getSubscriberFields();
expect($response)->contains([ verify($response)->arrayContains([
'id' => 'cf_' . $customField1->getId(), 'id' => 'cf_' . $customField1->getId(),
'name' => 'text custom field', 'name' => 'text custom field',
'type' => 'text', 'type' => 'text',
@ -71,7 +71,7 @@ class CustomFieldsTest extends \MailPoetTest {
'label' => 'text custom field', 'label' => 'text custom field',
], ],
]); ]);
expect($response)->contains([ verify($response)->arrayContains([
'id' => 'cf_' . $customField2->getId(), 'id' => 'cf_' . $customField2->getId(),
'name' => 'checkbox custom field', 'name' => 'checkbox custom field',
'type' => 'checkbox', 'type' => 'checkbox',

12
mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php
View File

@ -135,12 +135,12 @@ class AbandonedCartTest extends \MailPoetTest {
}); });
$abandonedCartEmail->init(); $abandonedCartEmail->init();
expect($registeredActions)->contains('woocommerce_add_to_cart'); verify($registeredActions)->arrayContains('woocommerce_add_to_cart');
expect($registeredActions)->contains('woocommerce_cart_item_removed'); verify($registeredActions)->arrayContains('woocommerce_cart_item_removed');
expect($registeredActions)->contains('woocommerce_after_cart_item_quantity_update'); verify($registeredActions)->arrayContains('woocommerce_after_cart_item_quantity_update');
expect($registeredActions)->contains('woocommerce_before_cart_item_quantity_zero'); verify($registeredActions)->arrayContains('woocommerce_before_cart_item_quantity_zero');
expect($registeredActions)->contains('woocommerce_cart_emptied'); verify($registeredActions)->arrayContains('woocommerce_cart_emptied');
expect($registeredActions)->contains('woocommerce_cart_item_restored'); verify($registeredActions)->arrayContains('woocommerce_cart_item_restored');
} }
public function testItRegistersToSubscriberActivityEvent() { public function testItRegistersToSubscriberActivityEvent() {

2
mailpoet/tests/integration/Models/ModelValidatorTest.php
View File

@ -15,7 +15,7 @@ class ModelValidatorTest extends \MailPoetTest {
public function testItConfiguresValidators() { public function testItConfiguresValidators() {
$configuredValidators = $this->validator->getValidators(); $configuredValidators = $this->validator->getValidators();
foreach (array_keys($this->validator->validators) as $validator) { foreach (array_keys($this->validator->validators) as $validator) {
expect($configuredValidators)->contains($validator); verify($configuredValidators)->arrayContains($validator);
} }
} }

6
mailpoet/tests/integration/Models/SubscriberTest.php
View File

@ -84,20 +84,20 @@ class SubscriberTest extends \MailPoetTest {
$subscriber = Subscriber::create(); $subscriber = Subscriber::create();
$subscriber->save(); $subscriber->save();
$errors = $subscriber->getErrors(); $errors = $subscriber->getErrors();
expect($errors)->contains("Please enter your email address"); verify($errors)->arrayContains("Please enter your email address");
// email address should be valid // email address should be valid
$subscriber = Subscriber::create(); $subscriber = Subscriber::create();
$subscriber->email = 'invalid_email'; $subscriber->email = 'invalid_email';
$subscriber->save(); $subscriber->save();
$errors = $subscriber->getErrors(); $errors = $subscriber->getErrors();
expect($errors)->contains("Your email address is invalid!"); verify($errors)->arrayContains("Your email address is invalid!");
$subscriber = Subscriber::create(); $subscriber = Subscriber::create();
$subscriber->email = 'tést@éxample.com'; $subscriber->email = 'tést@éxample.com';
$subscriber->save(); $subscriber->save();
$errors = $subscriber->getErrors(); $errors = $subscriber->getErrors();
expect($errors)->contains("Your email address is invalid!"); verify($errors)->arrayContains("Your email address is invalid!");
} }
public function emailMustBeUnique() { public function emailMustBeUnique() {

12
mailpoet/tests/integration/Newsletter/AutomatedLatestContentAPITest.php
View File

@ -219,14 +219,14 @@ class AutomatedLatestContentAPITest extends \MailPoetTest {
$this->loginWithRole("reader"); $this->loginWithRole("reader");
verify($result->data)->arrayCount(1); verify($result->data)->arrayCount(1);
expect($this->getPostTitles($result->data))->contains($publicPost['post_title']); verify($this->getPostTitles($result->data))->arrayContains($publicPost['post_title']);
$this->loginWithRole("editor"); $this->loginWithRole("editor");
$result = $this->alcAPI->getPosts(['postStatus' => "any", "contentType" => "post"]); $result = $this->alcAPI->getPosts(['postStatus' => "any", "contentType" => "post"]);
verify($result->data)->arrayCount(2); verify($result->data)->arrayCount(2);
expect($this->getPostTitles($result->data))->contains($publicPost["post_title"]); verify($this->getPostTitles($result->data))->arrayContains($publicPost["post_title"]);
expect($this->getPostTitles($result->data))->contains($privatePost["post_title"]); verify($this->getPostTitles($result->data))->arrayContains($privatePost["post_title"]);
$user = $this->loginWithRole("administrator"); $user = $this->loginWithRole("administrator");
if (is_multisite()) { if (is_multisite()) {
@ -235,8 +235,8 @@ class AutomatedLatestContentAPITest extends \MailPoetTest {
$result = $this->alcAPI->getPosts(['postStatus' => "any", "contentType" => "post"]); $result = $this->alcAPI->getPosts(['postStatus' => "any", "contentType" => "post"]);
verify($result->data)->arrayCount(3); verify($result->data)->arrayCount(3);
expect($this->getPostTitles($result->data))->contains($publicPost["post_title"]); verify($this->getPostTitles($result->data))->arrayContains($publicPost["post_title"]);
expect($this->getPostTitles($result->data))->contains($draftPost["post_title"]); verify($this->getPostTitles($result->data))->arrayContains($draftPost["post_title"]);
expect($this->getPostTitles($result->data))->contains($privatePost["post_title"]); verify($this->getPostTitles($result->data))->arrayContains($privatePost["post_title"]);
} }
} }

8
mailpoet/tests/integration/Segments/DynamicSegments/Filters/EmailActionTest.php
View File

@ -308,8 +308,8 @@ class EmailActionTest extends \MailPoetTest {
$emails = $this->tester->getSubscriberEmailsMatchingDynamicFilter($segmentFilterData, $this->emailAction); $emails = $this->tester->getSubscriberEmailsMatchingDynamicFilter($segmentFilterData, $this->emailAction);
expect($emails)->contains('1@example.com'); verify($emails)->arrayContains('1@example.com');
expect($emails)->contains('2@example.com'); verify($emails)->arrayContains('2@example.com');
expect($emails)->notContains('3@example.com'); expect($emails)->notContains('3@example.com');
} }
@ -330,7 +330,7 @@ class EmailActionTest extends \MailPoetTest {
$emails = $this->tester->getSubscriberEmailsMatchingDynamicFilter($segmentFilterData, $this->emailAction); $emails = $this->tester->getSubscriberEmailsMatchingDynamicFilter($segmentFilterData, $this->emailAction);
expect($emails)->contains('1@example.com'); verify($emails)->arrayContains('1@example.com');
expect($emails)->notContains('2@example.com'); expect($emails)->notContains('2@example.com');
expect($emails)->notContains('3@example.com'); expect($emails)->notContains('3@example.com');
} }
@ -354,7 +354,7 @@ class EmailActionTest extends \MailPoetTest {
expect($emails)->notContains('1@example.com'); expect($emails)->notContains('1@example.com');
expect($emails)->notContains('2@example.com'); expect($emails)->notContains('2@example.com');
expect($emails)->contains('3@example.com'); verify($emails)->arrayContains('3@example.com');
} }
public function testItRetrievesLookupDataForSentAction(): void { public function testItRetrievesLookupDataForSentAction(): void {

4
mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooFilterHelperTest.php
View File

@ -26,7 +26,7 @@ class WooFilterHelperTest extends \MailPoetTest {
$queryBuilder = $this->tester->getSubscribersQueryBuilder(); $queryBuilder = $this->tester->getSubscribersQueryBuilder();
$this->wooFilterHelper->applyOrderStatusFilter($queryBuilder); $this->wooFilterHelper->applyOrderStatusFilter($queryBuilder);
$emails = $this->tester->getSubscriberEmailsFromQueryBuilder($queryBuilder); $emails = $this->tester->getSubscriberEmailsFromQueryBuilder($queryBuilder);
expect($emails)->contains('customer@example.com'); verify($emails)->arrayContains('customer@example.com');
} }
/** /**
@ -49,7 +49,7 @@ class WooFilterHelperTest extends \MailPoetTest {
$queryBuilder = $this->tester->getSubscribersQueryBuilder(); $queryBuilder = $this->tester->getSubscribersQueryBuilder();
$this->wooFilterHelper->applyOrderStatusFilter($queryBuilder, ['wc-refunded']); $this->wooFilterHelper->applyOrderStatusFilter($queryBuilder, ['wc-refunded']);
$emails = $this->tester->getSubscriberEmailsFromQueryBuilder($queryBuilder); $emails = $this->tester->getSubscriberEmailsFromQueryBuilder($queryBuilder);
expect($emails)->contains('refunded@example.com'); verify($emails)->arrayContains('refunded@example.com');
expect($emails)->notContains('completed@example.com'); expect($emails)->notContains('completed@example.com');
} }

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

@ -79,7 +79,7 @@ class SubscribersFinderTest extends \MailPoetTest {
$finder = new SubscribersFinder($mock, $this->segmentsRepository, $this->entityManager); $finder = new SubscribersFinder($mock, $this->segmentsRepository, $this->entityManager);
$subscribers = $finder->findSubscribersInSegments([$this->subscriber3->getId()], [$this->segment3->getId()]); $subscribers = $finder->findSubscribersInSegments([$this->subscriber3->getId()], [$this->segment3->getId()]);
verify($subscribers)->arrayCount(1); verify($subscribers)->arrayCount(1);
expect($subscribers)->contains($this->subscriber3->getId()); verify($subscribers)->arrayContains($this->subscriber3->getId());
} }
public function testFindSubscribersInSegmentUsingFinderMakesResultUnique() { public function testFindSubscribersInSegmentUsingFinderMakesResultUnique() {

8
mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewsletterClicksExporterTest.php
View File

@ -57,10 +57,10 @@ class NewsletterClicksExporterTest extends \MailPoetTest {
verify($result['data'][0])->arrayHasKey('group_label'); verify($result['data'][0])->arrayHasKey('group_label');
verify($result['data'][0])->arrayHasKey('item_id'); verify($result['data'][0])->arrayHasKey('item_id');
verify($result['data'][0])->arrayHasKey('data'); verify($result['data'][0])->arrayHasKey('data');
expect($result['data'][0]['data'])->contains(['name' => 'Email subject', 'value' => 'Email Subject']); verify($result['data'][0]['data'])->arrayContains(['name' => 'Email subject', 'value' => 'Email Subject']);
expect($result['data'][0]['data'])->contains(['name' => 'URL', 'value' => 'Link url']); verify($result['data'][0]['data'])->arrayContains(['name' => 'URL', 'value' => 'Link url']);
expect($result['data'][0]['data'])->contains(['name' => 'Timestamp of the click event', 'value' => '2018-01-02 15:16:17']); verify($result['data'][0]['data'])->arrayContains(['name' => 'Timestamp of the click event', 'value' => '2018-01-02 15:16:17']);
expect($result['data'][0]['data'])->contains(['name' => 'User-agent', 'value' => $userAgentName]); verify($result['data'][0]['data'])->arrayContains(['name' => 'User-agent', 'value' => $userAgentName]);
} }
public function testExportReturnsDataWhenUserAgentIsUnknown() { public function testExportReturnsDataWhenUserAgentIsUnknown() {

8
mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporterTest.php
View File

@ -91,7 +91,7 @@ class NewslettersExporterTest extends \MailPoetTest {
verify($result['data'][0])->arrayHasKey('group_label'); verify($result['data'][0])->arrayHasKey('group_label');
verify($result['data'][0])->arrayHasKey('item_id'); verify($result['data'][0])->arrayHasKey('item_id');
verify($result['data'][0])->arrayHasKey('data'); verify($result['data'][0])->arrayHasKey('data');
expect($result['data'][0]['data'])->contains(['name' => 'Email subject', 'value' => 'Email Subject']); verify($result['data'][0]['data'])->arrayContains(['name' => 'Email subject', 'value' => 'Email Subject']);
} }
public function testExportReturnsUrl() { public function testExportReturnsUrl() {
@ -203,8 +203,8 @@ class NewslettersExporterTest extends \MailPoetTest {
$result = $this->exporter->export('user21@with.newsletters'); $result = $this->exporter->export('user21@with.newsletters');
verify(count($result['data']))->equals(2); verify(count($result['data']))->equals(2);
expect($result['data'][0]['data'])->contains(['name' => 'Opened', 'value' => 'Yes']); verify($result['data'][0]['data'])->arrayContains(['name' => 'Opened', 'value' => 'Yes']);
expect($result['data'][0]['data'])->contains(['name' => 'Opened at', 'value' => '2017-01-02 12:23:45']); verify($result['data'][0]['data'])->arrayContains(['name' => 'Opened at', 'value' => '2017-01-02 12:23:45']);
expect($result['data'][1]['data'])->contains(['name' => 'Opened', 'value' => 'No']); verify($result['data'][1]['data'])->arrayContains(['name' => 'Opened', 'value' => 'No']);
} }
} }

8
mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SubscriberExporterTest.php
View File

@ -81,7 +81,7 @@ class SubscriberExporterTest extends \MailPoetTest {
->create(); ->create();
$result = $this->exporter->export($email); $result = $this->exporter->export($email);
expect($result['data'][0]['data'])->contains([ verify($result['data'][0]['data'])->arrayContains([
'name' => "Subscriber's subscription source", 'name' => "Subscriber's subscription source",
'value' => 'Subscription via a MailPoet subscription form', 'value' => 'Subscription via a MailPoet subscription form',
]); ]);
@ -100,8 +100,8 @@ class SubscriberExporterTest extends \MailPoetTest {
->create(); ->create();
$result = $this->exporter->export($email); $result = $this->exporter->export($email);
expect($result['data'][0]['data'])->contains(['name' => 'Subscribed IP', 'value' => 'IP1']); verify($result['data'][0]['data'])->arrayContains(['name' => 'Subscribed IP', 'value' => 'IP1']);
expect($result['data'][0]['data'])->contains(['name' => 'Confirmed IP', 'value' => 'IP2']); verify($result['data'][0]['data'])->arrayContains(['name' => 'Confirmed IP', 'value' => 'IP2']);
} }
public function testExportSubscriberWithCustomField() { public function testExportSubscriberWithCustomField() {
@ -118,6 +118,6 @@ class SubscriberExporterTest extends \MailPoetTest {
->create(); ->create();
$result = $this->exporter->export($email); $result = $this->exporter->export($email);
expect($result['data'][0]['data'])->contains(['name' => 'Custom field1', 'value' => 'Value']); verify($result['data'][0]['data'])->arrayContains(['name' => 'Custom field1', 'value' => 'Value']);
} }
} }