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

Replace expect()->hasKey() with verify()->arrayHasKey()

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

[MAILPOET-5664]
This commit is contained in:
Rodrigo Primo
2023-10-18 15:48:25 -03:00
committed by David Remer
parent eba025a345
commit a70067a34c
22 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mailpoet/tests/integration/API/JSON/ResponseBuilders/DynamicSegmentsResponseBuilderTest.php
View File

@ -24,9 +24,9 @@ class DynamicSegmentsResponseBuilderTest extends \MailPoetTest {
verify($response['name'])->equals($name);
verify($response['description'])->equals($description);
verify($response['type'])->equals(SegmentEntity::TYPE_DYNAMIC);
expect($response)->hasKey('created_at');
expect($response)->hasKey('updated_at');
expect($response)->hasKey('deleted_at');
verify($response)->arrayHasKey('created_at');
verify($response)->arrayHasKey('updated_at');
verify($response)->arrayHasKey('deleted_at');
verify($response['filters_connect'])->equals(DynamicSegmentFilterData::CONNECT_TYPE_AND);
expect($response['filters'])->array();
expect($response['filters'])->count(1);
@ -51,9 +51,9 @@ class DynamicSegmentsResponseBuilderTest extends \MailPoetTest {
verify($response['name'])->equals($name);
verify($response['description'])->equals($description);
verify($response['type'])->equals(SegmentEntity::TYPE_DYNAMIC);
expect($response)->hasKey('created_at');
expect($response)->hasKey('updated_at');
expect($response)->hasKey('deleted_at');
verify($response)->arrayHasKey('created_at');
verify($response)->arrayHasKey('updated_at');
verify($response)->arrayHasKey('deleted_at');
verify($response['filters_connect'])->equals(DynamicSegmentFilterData::CONNECT_TYPE_AND);
expect($response['filters'])->array();
expect($response['filters'])->count(2);

8
mailpoet/tests/integration/API/JSON/ResponseBuilders/SegmentsResponseBuilderTest.php
View File

@ -24,10 +24,10 @@ class SegmentsResponseBuilderTest extends \MailPoetTest {
verify($response['name'])->equals($name);
verify($response['type'])->equals(SegmentEntity::TYPE_DEFAULT);
verify($response['description'])->equals($description);
expect($response)->hasKey('id');
expect($response)->hasKey('created_at');
expect($response)->hasKey('updated_at');
expect($response)->hasKey('deleted_at');
verify($response)->arrayHasKey('id');
verify($response)->arrayHasKey('created_at');
verify($response)->arrayHasKey('updated_at');
verify($response)->arrayHasKey('deleted_at');
$em->remove($segment);
$em->flush();
}

4
mailpoet/tests/integration/API/JSON/v1/FormsTest.php
View File

@ -66,8 +66,8 @@ class FormsTest extends \MailPoetTest {
verify($response->status)->equals(APIResponse::STATUS_OK);
expect($response->meta)->hasKey('filters');
expect($response->meta)->hasKey('groups');
verify($response->meta)->arrayHasKey('filters');
verify($response->meta)->arrayHasKey('groups');
verify($response->meta['count'])->equals(3);
expect($response->data)->count(3);

4
mailpoet/tests/integration/API/JSON/v1/NewslettersTest.php
View File

@ -442,8 +442,8 @@ class NewslettersTest extends \MailPoetTest {
verify($response->status)->equals(APIResponse::STATUS_OK);
expect($response->meta)->hasKey('filters');
expect($response->meta)->hasKey('groups');
verify($response->meta)->arrayHasKey('filters');
verify($response->meta)->arrayHasKey('groups');
verify($response->meta['count'])->equals(2);
expect($response->data)->count(2);

4
mailpoet/tests/integration/API/JSON/v1/SegmentsTest.php
View File

@ -74,8 +74,8 @@ class SegmentsTest extends \MailPoetTest {
verify($response->status)->equals(APIResponse::STATUS_OK);
expect($response->meta)->hasKey('filters');
expect($response->meta)->hasKey('groups');
verify($response->meta)->arrayHasKey('filters');
verify($response->meta)->arrayHasKey('groups');
verify($response->meta['count'])->equals(3);
expect($response->data)->count(3);

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

@ -93,10 +93,10 @@ class CustomFieldsTest extends \MailPoetTest {
],
]);
expect($response)->array();
expect($response)->hasKey('id');
expect($response)->hasKey('name');
expect($response)->hasKey('type');
expect($response)->hasKey('params');
verify($response)->arrayHasKey('id');
verify($response)->arrayHasKey('name');
verify($response)->arrayHasKey('type');
verify($response)->arrayHasKey('params');
expect($response['params'])->array();
}

2
mailpoet/tests/integration/API/MP/SubscribersTest.php
View File

@ -698,7 +698,7 @@ class SubscribersTest extends \MailPoetTest {
'settings' => $this->diContainer->get(SettingsController::class),
'requiredCustomFieldsValidator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']),
'subscribeToLists' => Expected::once(function ($subscriberId, $segmentsIds, $options) {
expect($options)->hasKey('send_confirmation_email');
verify($options)->arrayHasKey('send_confirmation_email');
verify($options['send_confirmation_email'])->equals(1);
return [];
}),

4
mailpoet/tests/integration/AutomaticEmails/AutomaticEmailsTest.php
View File

@ -44,7 +44,7 @@ class AutomaticEmailsTest extends \MailPoetTest {
});
$result = $this->AM->getAutomaticEmails();
expect($result)->hasKey('email1');
verify($result)->arrayHasKey('email1');
$this->AM->unregisterAutomaticEmails();
$result = $this->AM->getAutomaticEmails();
verify($result)->null();
@ -85,7 +85,7 @@ class AutomaticEmailsTest extends \MailPoetTest {
});
$result = $this->AM->getAutomaticEmails();
expect($result)->hasKey('email1');
verify($result)->arrayHasKey('email1');
expect($result)->hasNotKey('email2');
$this->wp->removeAllFilters('mailpoet_automatic_email_test1');

2
mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php
View File

@ -611,7 +611,7 @@ class NewsletterTest extends \MailPoetTest {
$this->entityManager->refresh($sendingQueue);
$updatedMeta = $sendingQueue->getMeta();
expect($updatedMeta)->array();
expect($updatedMeta)->hasKey('filterSegment');
verify($updatedMeta)->arrayHasKey('filterSegment');
$filterData = $updatedMeta['filterSegment']['filters'][0]['data'] ?? [];
verify($filterData['value'])->equals(50);
verify($filterData['operator'])->equals('higherThan');

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

@ -80,7 +80,7 @@ class ModelTest extends \MailPoetTest {
$model->set_orm($orm);
$model->save();
$errors = $model->getErrors();
expect($errors)->hasKey(MPModel::DUPLICATE_RECORD);
verify($errors)->arrayHasKey(MPModel::DUPLICATE_RECORD);
verify($errors[MPModel::DUPLICATE_RECORD])->stringContainsString('Please specify a different "name".');
}

4
mailpoet/tests/integration/Newsletter/Links/LinksTest.php
View File

@ -274,8 +274,8 @@ class LinksTest extends \MailPoetTest {
verify(count($links))->equals(2);
verify($links[1]['link'])->equals(NewsletterLinkEntity::INSTANT_UNSUBSCRIBE_LINK_SHORT_CODE);
verify($links[1]['type'])->equals(Links::LINK_TYPE_SHORTCODE);
expect($links[1])->hasKey('processed_link');
expect($links[1])->hasKey('hash');
verify($links[1])->arrayHasKey('processed_link');
verify($links[1])->arrayHasKey('hash');
$links = $this->links->ensureInstantUnsubscribeLink($links);
verify(count($links))->equals(2);
}

4
mailpoet/tests/integration/Newsletter/NewsletterSaveControllerTest.php
View File

@ -90,8 +90,8 @@ class NewsletterSaveControllerTest extends \MailPoetTest {
$updatedQueue = $newsletter->getLatestQueue();
$this->assertInstanceOf(SendingQueueEntity::class, $updatedQueue); // PHPStan
expect($updatedQueue->getNewsletterRenderedSubject())->same('My Updated Newsletter');
expect($updatedQueue->getNewsletterRenderedBody())->hasKey('html');
expect($updatedQueue->getNewsletterRenderedBody())->hasKey('text');
verify($updatedQueue->getNewsletterRenderedBody())->arrayHasKey('html');
verify($updatedQueue->getNewsletterRenderedBody())->arrayHasKey('text');
}
public function testItCanUpdatePostNotificationScheduleUponSave() {

6
mailpoet/tests/integration/Subscribers/ConfirmationEmailCustomizerTest.php
View File

@ -93,9 +93,9 @@ class ConfirmationEmailCustomizerTest extends \MailPoetTest {
expect($renderedContent)->array();
expect($renderedContent)->hasKey('html');
expect($renderedContent)->hasKey('text');
expect($renderedContent)->hasKey('subject');
verify($renderedContent)->arrayHasKey('html');
verify($renderedContent)->arrayHasKey('text');
verify($renderedContent)->arrayHasKey('subject');
}
public function testItRendersEmailWithDefaultTemplateContent() {

4
mailpoet/tests/integration/Subscribers/ImportExport/Import/MailChimpTest.php
View File

@ -108,8 +108,8 @@ class MailChimpTest extends \MailPoetTest {
$this->fail('MailChimp getSubscribers() threw an exception');
}
expect($subscribers)->hasKey('invalid');
expect($subscribers)->hasKey('duplicate');
verify($subscribers)->arrayHasKey('invalid');
verify($subscribers)->arrayHasKey('duplicate');
expect($subscribers['header'])->notEmpty();
expect($subscribers['subscribers'])->count(1);
verify($subscribers['subscribersCount'])->equals(1);

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

@ -24,9 +24,9 @@ class NewsletterClicksExporterTest extends \MailPoetTest {
public function testExportWorksWhenSubscriberNotFound() {
$result = $this->exporter->export('email.that@doesnt.exists');
expect($result)->array();
expect($result)->hasKey('data');
verify($result)->arrayHasKey('data');
verify($result['data'])->equals([]);
expect($result)->hasKey('done');
verify($result)->arrayHasKey('done');
verify($result['done'])->equals(true);
}
@ -38,9 +38,9 @@ class NewsletterClicksExporterTest extends \MailPoetTest {
$result = $this->exporter->export('email.that@has.no.newsletters');
expect($result)->array();
expect($result)->hasKey('data');
verify($result)->arrayHasKey('data');
verify($result['data'])->equals([]);
expect($result)->hasKey('done');
verify($result)->arrayHasKey('done');
verify($result['done'])->equals(true);
}
@ -53,10 +53,10 @@ class NewsletterClicksExporterTest extends \MailPoetTest {
expect($result['data'])->array();
expect($result['data'])->count(1);
verify($result['done'])->equals(true);
expect($result['data'][0])->hasKey('group_id');
expect($result['data'][0])->hasKey('group_label');
expect($result['data'][0])->hasKey('item_id');
expect($result['data'][0])->hasKey('data');
verify($result['data'][0])->arrayHasKey('group_id');
verify($result['data'][0])->arrayHasKey('group_label');
verify($result['data'][0])->arrayHasKey('item_id');
verify($result['data'][0])->arrayHasKey('data');
expect($result['data'][0]['data'])->contains(['name' => 'Email subject', 'value' => 'Email Subject']);
expect($result['data'][0]['data'])->contains(['name' => 'URL', 'value' => 'Link url']);
expect($result['data'][0]['data'])->contains(['name' => 'Timestamp of the click event', 'value' => '2018-01-02 15:16:17']);

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

@ -38,9 +38,9 @@ class NewslettersExporterTest extends \MailPoetTest {
public function testExportWorksWhenSubscriberNotFound() {
$result = $this->exporter->export('email.that@doesnt.exists');
expect($result)->array();
expect($result)->hasKey('data');
verify($result)->arrayHasKey('data');
verify($result['data'])->equals([]);
expect($result)->hasKey('done');
verify($result)->arrayHasKey('done');
verify($result['done'])->equals(true);
}
@ -48,9 +48,9 @@ class NewslettersExporterTest extends \MailPoetTest {
(new SubscriberFactory())->withEmail('email.that@has.no.newsletters')->create();
$result = $this->exporter->export('email.that@has.no.newsletters');
expect($result)->array();
expect($result)->hasKey('data');
verify($result)->arrayHasKey('data');
verify($result['data'])->equals([]);
expect($result)->hasKey('done');
verify($result)->arrayHasKey('done');
verify($result['done'])->equals(true);
}
@ -87,10 +87,10 @@ class NewslettersExporterTest extends \MailPoetTest {
expect($result['data'])->array();
expect($result['data'])->count(1);
verify($result['done'])->equals(true);
expect($result['data'][0])->hasKey('group_id');
expect($result['data'][0])->hasKey('group_label');
expect($result['data'][0])->hasKey('item_id');
expect($result['data'][0])->hasKey('data');
verify($result['data'][0])->arrayHasKey('group_id');
verify($result['data'][0])->arrayHasKey('group_label');
verify($result['data'][0])->arrayHasKey('item_id');
verify($result['data'][0])->arrayHasKey('data');
expect($result['data'][0]['data'])->contains(['name' => 'Email subject', 'value' => 'Email Subject']);
}

28
mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporterTest.php
View File

@ -24,9 +24,9 @@ class SegmentsExporterTest extends \MailPoetTest {
public function testExportWorksWhenSubscriberNotFound() {
$result = $this->exporter->export('email.that@doesnt.exists');
expect($result)->array();
expect($result)->hasKey('data');
verify($result)->arrayHasKey('data');
verify($result['data'])->equals([]);
expect($result)->hasKey('done');
verify($result)->arrayHasKey('done');
verify($result['done'])->equals(true);
}
@ -34,9 +34,9 @@ class SegmentsExporterTest extends \MailPoetTest {
(new SubscriberFactory())->withEmail('email.that@has.no.segments')->create();
$result = $this->exporter->export('email.that@has.no.segments');
expect($result)->array();
expect($result)->hasKey('data');
verify($result)->arrayHasKey('data');
verify($result['data'])->equals([]);
expect($result)->hasKey('done');
verify($result)->arrayHasKey('done');
verify($result['done'])->equals(true);
}
@ -61,8 +61,8 @@ class SegmentsExporterTest extends \MailPoetTest {
$result = $this->exporter->export($subscriber->getEmail());
expect($result)->array();
expect($result)->hasKey('data');
expect($result)->hasKey('done');
verify($result)->arrayHasKey('data');
verify($result)->arrayHasKey('done');
$expected = [
[
'group_id' => 'mailpoet-lists',
@ -94,14 +94,14 @@ class SegmentsExporterTest extends \MailPoetTest {
expect($result['data'])->array();
expect($result['data'])->count(2);
verify($result['done'])->equals(true);
expect($result['data'][0])->hasKey('group_id');
expect($result['data'][0])->hasKey('group_label');
expect($result['data'][0])->hasKey('item_id');
expect($result['data'][0])->hasKey('data');
expect($result['data'][1])->hasKey('group_id');
expect($result['data'][1])->hasKey('group_label');
expect($result['data'][1])->hasKey('item_id');
expect($result['data'][1])->hasKey('data');
verify($result['data'][0])->arrayHasKey('group_id');
verify($result['data'][0])->arrayHasKey('group_label');
verify($result['data'][0])->arrayHasKey('item_id');
verify($result['data'][0])->arrayHasKey('data');
verify($result['data'][1])->arrayHasKey('group_id');
verify($result['data'][1])->arrayHasKey('group_label');
verify($result['data'][1])->arrayHasKey('item_id');
verify($result['data'][1])->arrayHasKey('data');
verify($result['data'])->equals($expected);
}
}

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

@ -31,9 +31,9 @@ class SubscriberExporterTest extends \MailPoetTest {
public function testExportWorksWhenSubscriberNotFound() {
$result = $this->exporter->export('email.that@doesnt.exists');
expect($result)->array();
expect($result)->hasKey('data');
verify($result)->arrayHasKey('data');
verify($result['data'])->equals([]);
expect($result)->hasKey('done');
verify($result)->arrayHasKey('done');
verify($result['done'])->equals(true);
}
@ -49,15 +49,15 @@ class SubscriberExporterTest extends \MailPoetTest {
$result = $this->exporter->export($email);
expect($result)->array();
expect($result)->hasKey('data');
expect($result)->hasKey('done');
verify($result)->arrayHasKey('data');
verify($result)->arrayHasKey('done');
expect($result['data'])->array();
expect($result['data'])->count(1);
verify($result['done'])->equals(true);
expect($result['data'][0])->hasKey('group_id');
expect($result['data'][0])->hasKey('group_label');
expect($result['data'][0])->hasKey('item_id');
expect($result['data'][0])->hasKey('data');
verify($result['data'][0])->arrayHasKey('group_id');
verify($result['data'][0])->arrayHasKey('group_label');
verify($result['data'][0])->arrayHasKey('item_id');
verify($result['data'][0])->arrayHasKey('data');
$expected = [
['name' => 'First Name', 'value' => 'John'],
['name' => 'Last Name', 'value' => 'Doe'],

16
mailpoet/tests/integration/Subscribers/NewSubscriberNotificationMailerTest.php
View File

@ -76,12 +76,12 @@ class NewSubscriberNotificationMailerTest extends \MailPoetTest {
'send' =>
Expected::once(function($newsletter, $subscriber, $extraParams) {
verify($subscriber)->equals('a@b.c');
expect($newsletter)->hasKey('subject');
expect($newsletter)->hasKey('body');
verify($newsletter)->arrayHasKey('subject');
verify($newsletter)->arrayHasKey('body');
expect($newsletter)->count(2);
verify($newsletter['subject'])->equals('New subscriber to List1, List2');
expect($newsletter['body'])->hasKey('html');
expect($newsletter['body'])->hasKey('text');
verify($newsletter['body'])->arrayHasKey('html');
verify($newsletter['body'])->arrayHasKey('text');
expect($newsletter['body'])->count(2);
verify($newsletter['body']['text'])->stringContainsString('subscriber@example.com');
verify($newsletter['body']['html'])->stringContainsString('subscriber@example.com');
@ -106,12 +106,12 @@ class NewSubscriberNotificationMailerTest extends \MailPoetTest {
'send' =>
Expected::once(function($newsletter, $subscriber, $extraParams) {
verify($subscriber)->equals('a@b.c');
expect($newsletter)->hasKey('subject');
expect($newsletter)->hasKey('body');
verify($newsletter)->arrayHasKey('subject');
verify($newsletter)->arrayHasKey('body');
expect($newsletter)->count(2);
expect($newsletter['subject'])->matchesFormat('New subscriber to List %s, List %s');
expect($newsletter['body'])->hasKey('html');
expect($newsletter['body'])->hasKey('text');
verify($newsletter['body'])->arrayHasKey('html');
verify($newsletter['body'])->arrayHasKey('text');
expect($newsletter['body'])->count(2);
verify($newsletter['body']['text'])->stringContainsString('subscriber@example.com');
verify($newsletter['body']['html'])->stringContainsString('subscriber@example.com');

4
mailpoet/tests/integration/Subscribers/SubscriberPersonalDataEraserTest.php
View File

@ -29,9 +29,9 @@ class SubscriberPersonalDataEraserTest extends \MailPoetTest {
public function testExportWorksWhenSubscriberNotFound() {
$result = $this->eraser->erase('email.that@doesnt.exists');
expect($result)->array();
expect($result)->hasKey('items_removed');
verify($result)->arrayHasKey('items_removed');
verify($result['items_removed'])->equals(0);
expect($result)->hasKey('done');
verify($result)->arrayHasKey('done');
verify($result['done'])->equals(true);
}

2
mailpoet/tests/integration/Subscribers/SubscriberSubscribeControllerTest.php
View File

@ -106,7 +106,7 @@ class SubscriberSubscribeControllerTest extends \MailPoetTest {
$subscriber = $this->subscribersRepository->findOneBy(['email' => $data[$this->obfuscatedEmail]]);
$this->assertInstanceOf(SubscriberEntity::class, $subscriber);
expect($result)->hasKey('error');
verify($result)->arrayHasKey('error');
verify($result['error'])->equals('Confirmation email error');
}

10
mailpoet/tests/unit/CustomFields/ApiDataSanitizerTest.php
View File

@ -60,13 +60,13 @@ class ApiDataSanitizerTest extends \MailPoetUnitTest {
public function testItReturnsName() {
$result = $this->sanitizer->sanitize(['name' => 'Name', 'type' => 'text']);
expect($result)->hasKey('name');
verify($result)->arrayHasKey('name');
expect($result['name'])->same('Name');
}
public function testItReturnsType() {
$result = $this->sanitizer->sanitize(['name' => 'Name', 'type' => 'Text']);
expect($result)->hasKey('type');
verify($result)->arrayHasKey('type');
expect($result['type'])->same('text');
}
@ -77,7 +77,7 @@ class ApiDataSanitizerTest extends \MailPoetUnitTest {
public function testItReturnsParamsIfPassed() {
$result = $this->sanitizer->sanitize(['name' => 'Name', 'type' => 'text', 'params' => ['required' => '1']]);
expect($result)->hasKey('params');
verify($result)->arrayHasKey('params');
}
public function testItReturnsCorrectRequiredForm() {
@ -89,13 +89,13 @@ class ApiDataSanitizerTest extends \MailPoetUnitTest {
public function testItIgnoresUnknownParams() {
$result = $this->sanitizer->sanitize(['name' => 'Name', 'type' => 'text', 'params' => ['unknown' => 'Unknown property']]);
expect($result)->hasKey('params');
verify($result)->arrayHasKey('params');
expect($result['params'])->hasNotKey('unknown');
}
public function testItFillsLabel() {
$result = $this->sanitizer->sanitize(['name' => 'Name', 'type' => 'text']);
expect($result['params'])->hasKey('label');
verify($result['params'])->arrayHasKey('label');
expect($result['params']['label'])->same('Name');
}