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

Fix mock naming and strings in integration tests

Browse Source 
[MAILPOET-1796]
This commit is contained in:
Jan Jakeš
2020-01-09 14:19:00 +01:00
committed by Jan Jakeš
parent e66c76133e
commit 2ec85eee7b
23 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/SerializableConnection.php
View File

@ -22,7 +22,7 @@ class SerializableConnection extends Connection {
}
public function __sleep() {
return ['params', 'driver', 'config', 'event_manager'];
return ['params', 'driver', 'config', 'eventManager'];
}
public function __wakeup() {

4
tests/integration/API/JSON/v1/FeatureFlagsTest.php
View File

@ -130,8 +130,8 @@ class FeatureFlagsTest extends \MailPoetTest {
'defaults' => $defaults,
]);
$featureFlags = Stub::make(FeatureFlagsController::class, [
'features_controller' => $featuresController,
'feature_flags_repository' => $this->diContainer->get(FeatureFlagsRepository::class),
'featuresController' => $featuresController,
'featureFlagsRepository' => $this->diContainer->get(FeatureFlagsRepository::class),
]);
return new FeatureFlags($featuresController, $featureFlags);
}

2
tests/integration/API/JSON/v1/UserFlagsTest.php
View File

@ -21,7 +21,7 @@ class UserFlagsTest extends \MailPoetTest {
public function _before() {
$this->cleanup();
$this->userFlags = Stub::make(UserFlagsController::class, [
'user_flags_repository' => $this->diContainer->get(UserFlagsRepository::class),
'userFlagsRepository' => $this->diContainer->get(UserFlagsRepository::class),
'defaults' => [
'flag_1' => 'default_value_1',
'flag_2' => 'default_value_2',

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

@ -530,8 +530,8 @@ class APITest extends \MailPoetTest {
\MailPoet\API\MP\v1\API::class,
'addSubscriber',
[
'new_subscriber_notification_mailer' => Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']),
'required_custom_field_validator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']),
'newSubscriberNotificationMailer' => Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']),
'requiredCustomFieldValidator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']),
'_scheduleWelcomeNotification' => Expected::once(),
], $this);
$subscriber = [
@ -578,10 +578,10 @@ class APITest extends \MailPoetTest {
'addSubscriber',
[
'_scheduleWelcomeNotification' => Expected::never(),
'new_subscriber_notification_mailer' => Stub::makeEmpty(
'newSubscriberNotificationMailer' => Stub::makeEmpty(
NewSubscriberNotificationMailer::class, ['send' => Expected::never()]
),
'required_custom_field_validator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']),
'requiredCustomFieldValidator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']),
], $this);
$subscriber = [
'email' => 'test@example.com',
@ -596,8 +596,8 @@ class APITest extends \MailPoetTest {
'addSubscriber',
[
'_scheduleWelcomeNotification' => Expected::never(),
'new_subscriber_notification_mailer' => Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']),
'required_custom_field_validator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']),
'newSubscriberNotificationMailer' => Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']),
'requiredCustomFieldValidator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']),
], $this);
$subscriber = [
'email' => 'test@example.com',
@ -617,8 +617,8 @@ class APITest extends \MailPoetTest {
expect($options)->contains('send_confirmation_email');
expect($options['send_confirmation_email'])->equals(true);
}),
'required_custom_field_validator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']),
'new_subscriber_notification_mailer' => Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']),
'requiredCustomFieldValidator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']),
'newSubscriberNotificationMailer' => Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']),
]
);
$subscriber = [
@ -638,7 +638,7 @@ class APITest extends \MailPoetTest {
});
$API = Stub::copy($this->getApi(), [
'confirmation_email_mailer' => $confirmationMailer,
'confirmationEmailMailer' => $confirmationMailer,
]);
$segment = Segment::createOrUpdate(
[
@ -659,8 +659,8 @@ class APITest extends \MailPoetTest {
'addSubscriber',
[
'__sendConfirmationEmail' => Expected::never(),
'required_custom_field_validator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']),
'new_subscriber_notification_mailer' => Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']),
'requiredCustomFieldValidator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']),
'newSubscriberNotificationMailer' => Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']),
], $this);
$subscriber = [
'email' => 'test@example.com',

4
tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php
View File

@ -248,9 +248,9 @@ class AbandonedCartTest extends \MailPoetTest {
private function createAbandonedCartEmail() {
return $this->make(AbandonedCart::class, [
'wp' => $this->wp,
'woo_commerce_helper' => $this->wooCommerceHelperMock,
'wooCommerceHelper' => $this->wooCommerceHelperMock,
'cookies' => new Cookies(),
'page_visit_tracker' => $this->pageVisitTrackerMock,
'pageVisitTracker' => $this->pageVisitTrackerMock,
'scheduler' => new AutomaticEmailScheduler(),
]);
}

2
tests/integration/Config/CapabilitiesTest.php
View File

@ -120,7 +120,7 @@ class CapabilitiesTest extends \MailPoetTest {
'registerMembersCapabilities',
[
'registerMembersCapability' => Expected::exactly($permissionCount),
'access_control' => $this->accessControl,
'accessControl' => $this->accessControl,
],
$this
);

4
tests/integration/Config/DatabaseTest.php
View File

@ -32,8 +32,8 @@ class DatabaseTest extends \MailPoetTest {
$result = ORM::for_table("")
->raw_query(
'SELECT ' .
'@@sql_mode as sql_mode, ' .
'@@session.time_zone as time_zone'
'@@sql_mode as sqlMode, ' .
'@@session.time_zone as timeZone'
)
->findOne();
// disable ONLY_FULL_GROUP_BY

18
tests/integration/Cron/Workers/SchedulerTest.php
View File

@ -434,8 +434,8 @@ class SchedulerTest extends \MailPoetTest {
'deleteQueueOrUpdateNextRunDate' => Expected::exactly(1, function() {
return false;
}),
'logger_factory' => $this->loggerFactory,
'cron_helper' => $this->cronHelper,
'loggerFactory' => $this->loggerFactory,
'cronHelper' => $this->cronHelper,
], $this);
expect($scheduler->processPostNotificationNewsletter($newsletter, $queue))->false();
}
@ -525,7 +525,7 @@ class SchedulerTest extends \MailPoetTest {
$queue->save();
$scheduler = Stub::make(Scheduler::class, [
'processWelcomeNewsletter' => Expected::exactly(1),
'cron_helper' => $this->cronHelper,
'cronHelper' => $this->cronHelper,
], $this);
$scheduler->process();
}
@ -537,7 +537,7 @@ class SchedulerTest extends \MailPoetTest {
$queue->save();
$scheduler = Stub::make(Scheduler::class, [
'processPostNotificationNewsletter' => Expected::exactly(1),
'cron_helper' => $this->cronHelper,
'cronHelper' => $this->cronHelper,
], $this);
$scheduler->process();
}
@ -549,7 +549,7 @@ class SchedulerTest extends \MailPoetTest {
$queue->save();
$scheduler = Stub::make(Scheduler::class, [
'processScheduledStandardNewsletter' => Expected::exactly(1),
'cron_helper' => $this->cronHelper,
'cronHelper' => $this->cronHelper,
], $this);
$scheduler->process();
}
@ -561,7 +561,7 @@ class SchedulerTest extends \MailPoetTest {
$queue->save();
$scheduler = Stub::make(Scheduler::class, [
'processPostNotificationNewsletter' => Expected::exactly(1),
'cron_helper' => $this->make(CronHelper::class, [
'cronHelper' => $this->make(CronHelper::class, [
'enforceExecutionLimit' => Expected::exactly(2), // call at start + during processing
]),
], $this);
@ -576,7 +576,7 @@ class SchedulerTest extends \MailPoetTest {
$scheduler = Stub::make(Scheduler::class, [
'processScheduledStandardNewsletter' => Expected::never(),
'cron_helper' => $this->cronHelper,
'cronHelper' => $this->cronHelper,
], $this);
// scheduled job is not processed
$scheduler->process();
@ -590,7 +590,7 @@ class SchedulerTest extends \MailPoetTest {
$scheduler = Stub::make(Scheduler::class, [
'processScheduledStandardNewsletter' => Expected::once(),
'cron_helper' => $this->cronHelper,
'cronHelper' => $this->cronHelper,
], $this);
// scheduled job is processed
$scheduler->process();
@ -636,7 +636,7 @@ class SchedulerTest extends \MailPoetTest {
$scheduler = Stub::make(Scheduler::class, [
'processScheduledStandardNewsletter' => Expected::once(),
'cron_helper' => $this->cronHelper,
'cronHelper' => $this->cronHelper,
], $this);
// scheduled job is processed
$scheduler->process();

2
tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php
View File

@ -247,7 +247,7 @@ class SendingQueueTest extends \MailPoetTest {
[
'processQueue' => function() {
// this function returns a queue object
return (object)['status' => null, 'task_id' => 0];
return (object)['status' => null, 'taskId' => 0];
},
'enforceSendingAndExecutionLimits' => Expected::exactly(2),
], $this);

4
tests/integration/Cron/Workers/SendingQueue/Tasks/MailerTest.php
View File

@ -120,14 +120,14 @@ class MailerTest extends \MailPoetTest {
// mock mailer instance and ensure that send method is invoked
$mailerTask = new MailerTask(
(object)[
'mailer_instance' => Stub::make(
'mailerInstance' => Stub::make(
$phpMailClass,
['send' => Expected::exactly(1, function() {
return true;
})],
$this
),
'mailer_config' => [
'mailerConfig' => [
'method' => null,
],
]

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

@ -220,7 +220,7 @@ class NewsletterTest extends \MailPoetTest {
$this->newsletter->parentId = $this->newsletter->id;
$postsTask = $this->make(PostsTask::class, [
'getAlcPostsCount' => 1,
'logger_factory' => $this->loggerFactory,
'loggerFactory' => $this->loggerFactory,
]);
$newsletterTask = new NewsletterTask(new WPFunctions, $postsTask);
$result = $newsletterTask->preProcessNewsletter($this->newsletter, $this->queue);

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

@ -32,7 +32,7 @@ class PostsTest extends \MailPoetTest {
$postId = 10;
$newsletter = (object)[
'id' => 2,
'parent_id' => 1,
'parentId' => 1,
'type' => Newsletter::TYPE_NOTIFICATION_HISTORY,
];
$renderedNewsletter = [

4
tests/integration/Doctrine/ConnectionFactoryTest.php
View File

@ -114,7 +114,7 @@ class ConnectionFactoryTest extends \MailPoetTest {
public function testItSelectivelyUpdatesWaitTimeoutOption() {
// timeout will be kept from DB defaults
$connectionFactory = $this->make(ConnectionFactory::class, [
'min_wait_timeout' => 1,
'minWaitTimeout' => 1,
]);
$connection = $connectionFactory->createConnection();
$current = $connection->executeQuery('SELECT @@session.wait_timeout')->fetchColumn();
@ -122,7 +122,7 @@ class ConnectionFactoryTest extends \MailPoetTest {
// timeout will be set to higher value
$connectionFactory = $this->make(ConnectionFactory::class, [
'min_wait_timeout' => 999999,
'minWaitTimeout' => 999999,
]);
$connection = $connectionFactory->createConnection();
$current = $connection->executeQuery('SELECT @@session.wait_timeout')->fetchColumn();

2
tests/integration/Mailer/Methods/AmazonSESTest.php
View File

@ -249,7 +249,7 @@ class AmazonSESTest extends \MailPoetTest {
$blacklist = Stub::make(new BlacklistCheck(), ['isBlacklisted' => true], $this);
$mailer = Stub::make(
$this->mailer,
['blacklist' => $blacklist, 'error_mapper' => new AmazonSESMapper()],
['blacklist' => $blacklist, 'errorMapper' => new AmazonSESMapper()],
$this
);
$result = $mailer->send(

8
tests/integration/Mailer/Methods/MailPoetAPITest.php
View File

@ -276,8 +276,8 @@ class MailPoetAPITest extends \MailPoetTest {
$this->mailer,
[
'blacklist' => $blacklist,
'error_mapper' => new MailPoetMapper(),
'services_checker' => Stub::make(
'errorMapper' => new MailPoetMapper(),
'servicesChecker' => Stub::make(
new ServicesChecker(),
['isMailPoetAPIKeyValid' => true],
$this
@ -302,8 +302,8 @@ class MailPoetAPITest extends \MailPoetTest {
$this->mailer,
[
'blacklist' => $blacklist,
'error_mapper' => new MailPoetMapper(),
'services_checker' => Stub::make(
'errorMapper' => new MailPoetMapper(),
'servicesChecker' => Stub::make(
new ServicesChecker(),
['isMailPoetAPIKeyValid' => true],
$this

2
tests/integration/Mailer/Methods/PHPMailTest.php
View File

@ -142,7 +142,7 @@ class PHPMailTest extends \MailPoetTest {
$blacklist = Stub::make(new BlacklistCheck(), ['isBlacklisted' => true], $this);
$mailer = Stub::make(
$this->mailer,
['blacklist' => $blacklist, 'error_mapper' => new PHPMailMapper()],
['blacklist' => $blacklist, 'errorMapper' => new PHPMailMapper()],
$this
);
$result = $mailer->send(

2
tests/integration/Mailer/Methods/SMTPTest.php
View File

@ -188,7 +188,7 @@ class SMTPTest extends \MailPoetTest {
$blacklist = Stub::make(new BlacklistCheck(), ['isBlacklisted' => true], $this);
$mailer = Stub::make(
$this->mailer,
['blacklist' => $blacklist, 'error_mapper' => new SMTPMapper()],
['blacklist' => $blacklist, 'errorMapper' => new SMTPMapper()],
$this
);
$result = $mailer->send(

2
tests/integration/Mailer/Methods/SendGridTest.php
View File

@ -98,7 +98,7 @@ class SendGridTest extends \MailPoetTest {
$blacklist = Stub::make(new BlacklistCheck(), ['isBlacklisted' => true], $this);
$mailer = Stub::make(
$this->mailer,
['blacklist' => $blacklist, 'error_mapper' => new SendGridMapper()],
['blacklist' => $blacklist, 'errorMapper' => new SendGridMapper()],
$this
);
$result = $mailer->send(

2
tests/integration/Models/NewsletterTest.php
View File

@ -281,7 +281,7 @@ class NewsletterTest extends \MailPoetTest {
public function testItCanHaveOptions() {
$newsletterOptions = [
'name' => 'Event',
'name' => 'event',
'newsletter_type' => Newsletter::TYPE_WELCOME,
];
$optionField = NewsletterOptionField::create();

2
tests/integration/Router/Endpoints/TrackTest.php
View File

@ -90,7 +90,7 @@ class TrackTest extends \MailPoetTest {
);
$data->subscriber->email = 'random@email.com';
$track = Stub::make(Track::class, [
'link_tokens' => new LinkTokens,
'linkTokens' => new LinkTokens,
'terminate' => function($code) {
expect($code)->equals(403);
},

4
tests/integration/Router/Endpoints/ViewInBrowserTest.php
View File

@ -70,7 +70,7 @@ class ViewInBrowserTest extends \MailPoetTest {
public function testItAbortsWhenBrowserPreviewDataIsInvalid() {
$viewInBrowser = Stub::make($this->viewInBrowser, [
'link_tokens' => new LinkTokens,
'linkTokens' => new LinkTokens,
'_abort' => Expected::exactly(3),
], $this);
// newsletter ID is invalid
@ -215,7 +215,7 @@ class ViewInBrowserTest extends \MailPoetTest {
public function testItReturnsViewActionResult() {
$viewInBrowser = Stub::make($this->viewInBrowser, [
'link_tokens' => new LinkTokens,
'linkTokens' => new LinkTokens,
'_displayNewsletter' => Expected::exactly(1),
'settings' => SettingsController::getInstance(),
'emoji' => new Emoji(),

2
tests/integration/Settings/SettingsControllerTest.php
View File

@ -53,7 +53,7 @@ class SettingsControllerTest extends \MailPoetTest {
public function testItReturnsDefaultValueAsFallback() {
$settings = Stub::make($this->controller, [
'settings_repository' => $this->make(SettingsRepository::class, [
'settingsRepository' => $this->make(SettingsRepository::class, [
'findOneByName' => null,
'findAll' => [],
]),

2
tests/integration/Settings/UserFlagsControllerTest.php
View File

@ -32,7 +32,7 @@ class UserFlagsControllerTest extends \MailPoetTest {
$this->currentUserId = $currentUserId;
$this->userFlagsRepository = $this->diContainer->get(UserFlagsRepository::class);
$this->userFlags = Stub::make(UserFlagsController::class, [
'user_flags_repository' => $this->userFlagsRepository,
'userFlagsRepository' => $this->userFlagsRepository,
'defaults' => [
'flag_1' => 'default_value_1',
'flag_2' => 'default_value_2',