Add public keyword to methods
[MAILPOET-2413]
This commit is contained in:
Amine Ben hammou
wxa
@ -19,7 +19,7 @@ class MigrationTest extends \MailPoetTest {
|
||||
/** @var Migration */
|
||||
private $worker;
|
||||
|
||||
function _before() {
|
||||
public function _before() {
|
||||
parent::_before();
|
||||
// Alter table to test migration
|
||||
$this->downgradeTable();
|
||||
@ -44,17 +44,17 @@ class MigrationTest extends \MailPoetTest {
|
||||
$this->worker = new Migration(microtime(true));
|
||||
}
|
||||
|
||||
function testItDefinesConstants() {
|
||||
public function testItDefinesConstants() {
|
||||
expect(Migration::BATCH_SIZE)->equals(20);
|
||||
}
|
||||
|
||||
function testItChecksForACompletedMigrationBeforeRunning() {
|
||||
public function testItChecksForACompletedMigrationBeforeRunning() {
|
||||
expect($this->worker->checkProcessingRequirements())->true();
|
||||
$this->createCompletedTask();
|
||||
expect($this->worker->checkProcessingRequirements())->false();
|
||||
}
|
||||
|
||||
function testItPausesSendingWhenPreparingATask() {
|
||||
public function testItPausesSendingWhenPreparingATask() {
|
||||
$task = $this->createScheduledTask();
|
||||
expect(MailerLog::isSendingPaused())->false();
|
||||
$result = $this->worker->prepareTaskStrategy($task, microtime(true));
|
||||
@ -62,7 +62,7 @@ class MigrationTest extends \MailPoetTest {
|
||||
expect(MailerLog::isSendingPaused())->true();
|
||||
}
|
||||
|
||||
function testItResumesSendingIfThereIsNothingToMigrate() {
|
||||
public function testItResumesSendingIfThereIsNothingToMigrate() {
|
||||
SendingQueue::deleteMany();
|
||||
$this->worker->pauseSending();
|
||||
expect(MailerLog::isSendingPaused())->true();
|
||||
@ -71,14 +71,14 @@ class MigrationTest extends \MailPoetTest {
|
||||
expect(MailerLog::isSendingPaused())->false();
|
||||
}
|
||||
|
||||
function testItCompletesTaskIfThereIsNothingToMigrate() {
|
||||
public function testItCompletesTaskIfThereIsNothingToMigrate() {
|
||||
SendingQueue::deleteMany();
|
||||
$task = $this->createScheduledTask();
|
||||
$this->worker->prepareTaskStrategy($task, microtime(true));
|
||||
expect(ScheduledTask::findOne($task->id)->status)->equals(ScheduledTask::STATUS_COMPLETED);
|
||||
}
|
||||
|
||||
function testItMigratesSendingQueuesAndSubscribers() {
|
||||
public function testItMigratesSendingQueuesAndSubscribers() {
|
||||
expect($this->worker->getUnmigratedQueues()->count())->equals(4);
|
||||
expect(ScheduledTask::where('type', SendingTask::TASK_TYPE)->findMany())->count(0);
|
||||
expect(ScheduledTaskSubscriber::whereGt('task_id', 0)->count())->equals(0);
|
||||
@ -102,7 +102,7 @@ class MigrationTest extends \MailPoetTest {
|
||||
expect($migrated_subscribers[1]->processed)->equals(ScheduledTaskSubscriber::STATUS_PROCESSED);
|
||||
}
|
||||
|
||||
function testItResumesSendingAfterMigratingSendingQueuesAndSubscribers() {
|
||||
public function testItResumesSendingAfterMigratingSendingQueuesAndSubscribers() {
|
||||
$this->worker->pauseSending();
|
||||
expect(MailerLog::isSendingPaused())->true();
|
||||
$task = $this->createRunningTask();
|
||||
@ -110,7 +110,7 @@ class MigrationTest extends \MailPoetTest {
|
||||
expect(MailerLog::isSendingPaused())->false();
|
||||
}
|
||||
|
||||
function testItUsesWPTimeToReturnNextRunDate() {
|
||||
public function testItUsesWPTimeToReturnNextRunDate() {
|
||||
$timestamp = 1514801410;
|
||||
|
||||
$wp = Stub::make(new WPFunctions, [
|
||||
@ -191,7 +191,7 @@ class MigrationTest extends \MailPoetTest {
|
||||
);
|
||||
}
|
||||
|
||||
function _after() {
|
||||
public function _after() {
|
||||
$this->di_container->get(SettingsRepository::class)->truncate();
|
||||
ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table);
|
||||
ORM::raw_execute('TRUNCATE ' . ScheduledTaskSubscriber::$_table);
|
||||
|
||||
@ -14,12 +14,12 @@ class SendingErrorHandlerTest extends \MailPoetTest {
|
||||
/** @var SendingErrorHandler */
|
||||
private $error_handler;
|
||||
|
||||
function _before() {
|
||||
public function _before() {
|
||||
parent::_before();
|
||||
$this->error_handler = new SendingErrorHandler();
|
||||
}
|
||||
|
||||
function testItShouldProcessSoftErrorCorrectly() {
|
||||
public function testItShouldProcessSoftErrorCorrectly() {
|
||||
$subscribers = [
|
||||
'john@doe.com',
|
||||
'john@rambo.com',
|
||||
|
||||
@ -54,7 +54,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
/** @var LoggerFactory */
|
||||
private $logger_factory;
|
||||
|
||||
function _before() {
|
||||
public function _before() {
|
||||
parent::_before();
|
||||
$wp_users = get_users();
|
||||
wp_set_current_user($wp_users[0]->ID);
|
||||
@ -131,13 +131,13 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
);
|
||||
}
|
||||
|
||||
function testItConstructs() {
|
||||
public function testItConstructs() {
|
||||
expect($this->sending_queue_worker->batch_size)->equals(SendingQueueWorker::BATCH_SIZE);
|
||||
expect($this->sending_queue_worker->mailer_task instanceof MailerTask);
|
||||
expect($this->sending_queue_worker->newsletter_task instanceof NewsletterTask);
|
||||
}
|
||||
|
||||
function testItEnforcesExecutionLimitsBeforeQueueProcessing() {
|
||||
public function testItEnforcesExecutionLimitsBeforeQueueProcessing() {
|
||||
$sending_queue_worker = Stub::make(
|
||||
new SendingQueueWorker(
|
||||
$this->sending_error_handler,
|
||||
@ -161,7 +161,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
}
|
||||
}
|
||||
|
||||
function testItEnforcesExecutionLimitsAfterSendingWhenQueueStatusIsNotSetToComplete() {
|
||||
public function testItEnforcesExecutionLimitsAfterSendingWhenQueueStatusIsNotSetToComplete() {
|
||||
$sending_queue_worker = Stub::make(
|
||||
new SendingQueueWorker($this->sending_error_handler, $this->stats_notifications_worker, $this->logger_factory, Stub::makeEmpty(NewslettersRepository::class), $this->cron_helper),
|
||||
[
|
||||
@ -194,7 +194,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
);
|
||||
}
|
||||
|
||||
function testItDoesNotEnforceExecutionLimitsAfterSendingWhenQueueStatusIsSetToComplete() {
|
||||
public function testItDoesNotEnforceExecutionLimitsAfterSendingWhenQueueStatusIsSetToComplete() {
|
||||
// when sending is done and there are no more subscribers to process, continue
|
||||
// without enforcing execution limits. this allows the newsletter to be marked as sent
|
||||
// in the process() method and after that execution limits will be enforced
|
||||
@ -232,7 +232,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
);
|
||||
}
|
||||
|
||||
function testItEnforcesExecutionLimitsAfterQueueProcessing() {
|
||||
public function testItEnforcesExecutionLimitsAfterQueueProcessing() {
|
||||
$sending_queue_worker = Stub::make(
|
||||
new SendingQueueWorker($this->sending_error_handler, $this->stats_notifications_worker, $this->logger_factory, Stub::makeEmpty(NewslettersRepository::class), $this->cron_helper),
|
||||
[
|
||||
@ -246,7 +246,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
$sending_queue_worker->process();
|
||||
}
|
||||
|
||||
function testItDeletesQueueWhenNewsletterIsNotFound() {
|
||||
public function testItDeletesQueueWhenNewsletterIsNotFound() {
|
||||
// queue exists
|
||||
$queue = SendingQueue::findOne($this->queue->id);
|
||||
expect($queue)->notEquals(false);
|
||||
@ -261,7 +261,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
expect($queue)->false(false);
|
||||
}
|
||||
|
||||
function testItPassesExtraParametersToMailerWhenTrackingIsDisabled() {
|
||||
public function testItPassesExtraParametersToMailerWhenTrackingIsDisabled() {
|
||||
$this->settings->set('tracking.enabled', false);
|
||||
$directUnsubscribeURL = $this->getDirectUnsubscribeURL();
|
||||
$sending_queue_worker = new SendingQueueWorker(
|
||||
@ -291,7 +291,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
$sending_queue_worker->process();
|
||||
}
|
||||
|
||||
function testItPassesExtraParametersToMailerWhenTrackingIsEnabled() {
|
||||
public function testItPassesExtraParametersToMailerWhenTrackingIsEnabled() {
|
||||
$this->settings->set('tracking.enabled', true);
|
||||
$trackedUnsubscribeURL = $this->getTrackedUnsubscribeURL();
|
||||
$sending_queue_worker = new SendingQueueWorker(
|
||||
@ -321,7 +321,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
$sending_queue_worker->process();
|
||||
}
|
||||
|
||||
function testItCanProcessSubscribersOneByOne() {
|
||||
public function testItCanProcessSubscribersOneByOne() {
|
||||
$sending_queue_worker = new SendingQueueWorker(
|
||||
$this->sending_error_handler,
|
||||
$this->stats_notifications_worker,
|
||||
@ -368,7 +368,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
expect($statistics)->notEquals(false);
|
||||
}
|
||||
|
||||
function testItCanProcessSubscribersInBulk() {
|
||||
public function testItCanProcessSubscribersInBulk() {
|
||||
$sending_queue_worker = new SendingQueueWorker(
|
||||
$this->sending_error_handler,
|
||||
$this->stats_notifications_worker,
|
||||
@ -418,7 +418,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
expect($statistics)->notEquals(false);
|
||||
}
|
||||
|
||||
function testItProcessesStandardNewsletters() {
|
||||
public function testItProcessesStandardNewsletters() {
|
||||
$sending_queue_worker = new SendingQueueWorker(
|
||||
$this->sending_error_handler,
|
||||
$this->stats_notifications_worker,
|
||||
@ -466,7 +466,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
expect($statistics)->notEquals(false);
|
||||
}
|
||||
|
||||
function testItUpdatesUpdateTime() {
|
||||
public function testItUpdatesUpdateTime() {
|
||||
$originalUpdated = Carbon::createFromTimestamp(current_time('timestamp'))->subHours(5)->toDateTimeString();
|
||||
|
||||
$this->queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
|
||||
@ -490,7 +490,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
expect($newQueue->updated_at)->notEquals($originalUpdated);
|
||||
}
|
||||
|
||||
function testItCanProcessWelcomeNewsletters() {
|
||||
public function testItCanProcessWelcomeNewsletters() {
|
||||
$this->newsletter->type = Newsletter::TYPE_WELCOME;
|
||||
$this->newsletter_segment->delete();
|
||||
|
||||
@ -540,7 +540,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
expect($statistics)->notEquals(false);
|
||||
}
|
||||
|
||||
function testItPreventsSendingWelcomeEmailWhenSubscriberIsUnsubscribed() {
|
||||
public function testItPreventsSendingWelcomeEmailWhenSubscriberIsUnsubscribed() {
|
||||
$this->newsletter->type = Newsletter::TYPE_WELCOME;
|
||||
$this->subscriber->status = Subscriber::STATUS_UNSUBSCRIBED;
|
||||
$this->subscriber->save();
|
||||
@ -572,7 +572,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
expect($updated_queue->count_to_process)->equals(0);
|
||||
}
|
||||
|
||||
function testItRemovesNonexistentSubscribersFromProcessingList() {
|
||||
public function testItRemovesNonexistentSubscribersFromProcessingList() {
|
||||
$queue = $this->queue;
|
||||
$queue->setSubscribers([
|
||||
$this->subscriber->id(),
|
||||
@ -607,7 +607,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
expect(count($statistics))->equals(1);
|
||||
}
|
||||
|
||||
function testItUpdatesQueueSubscriberCountWhenNoneOfSubscribersExist() {
|
||||
public function testItUpdatesQueueSubscriberCountWhenNoneOfSubscribersExist() {
|
||||
$queue = $this->queue;
|
||||
$queue->setSubscribers([
|
||||
123,
|
||||
@ -633,7 +633,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
expect($updated_queue->count_to_process)->equals(0);
|
||||
}
|
||||
|
||||
function testItDoesNotSendToTrashedSubscribers() {
|
||||
public function testItDoesNotSendToTrashedSubscribers() {
|
||||
$sending_queue_worker = $this->sending_queue_worker;
|
||||
$sending_queue_worker->mailer_task = Stub::make(
|
||||
new MailerTask(),
|
||||
@ -656,7 +656,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
expect((int)$updated_queue->count_total)->equals(0);
|
||||
}
|
||||
|
||||
function testItDoesNotSendToGloballyUnsubscribedSubscribers() {
|
||||
public function testItDoesNotSendToGloballyUnsubscribedSubscribers() {
|
||||
$sending_queue_worker = $this->sending_queue_worker;
|
||||
$sending_queue_worker->mailer_task = Stub::make(
|
||||
new MailerTask(),
|
||||
@ -672,7 +672,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
expect((int)$updated_queue->count_total)->equals(0);
|
||||
}
|
||||
|
||||
function testItDoesNotSendToSubscribersUnsubscribedFromSegments() {
|
||||
public function testItDoesNotSendToSubscribersUnsubscribedFromSegments() {
|
||||
$sending_queue_worker = $this->sending_queue_worker;
|
||||
$sending_queue_worker->mailer_task = Stub::make(
|
||||
new MailerTask(),
|
||||
@ -688,7 +688,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
expect((int)$updated_queue->count_total)->equals(0);
|
||||
}
|
||||
|
||||
function testItDoesNotSendToInactiveSubscribers() {
|
||||
public function testItDoesNotSendToInactiveSubscribers() {
|
||||
$sending_queue_worker = $this->sending_queue_worker;
|
||||
$sending_queue_worker->mailer_task = Stub::make(
|
||||
new MailerTask(),
|
||||
@ -704,7 +704,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
expect((int)$updated_queue->count_total)->equals(0);
|
||||
}
|
||||
|
||||
function testItPausesSendingWhenProcessedSubscriberListCannotBeUpdated() {
|
||||
public function testItPausesSendingWhenProcessedSubscriberListCannotBeUpdated() {
|
||||
$sending_task = $this->createMock(SendingTask::class);
|
||||
$sending_task
|
||||
->method('updateProcessedSubscribers')
|
||||
@ -756,7 +756,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
);
|
||||
}
|
||||
|
||||
function testItDoesNotUpdateNewsletterHashDuringSending() {
|
||||
public function testItDoesNotUpdateNewsletterHashDuringSending() {
|
||||
$sending_queue_worker = new SendingQueueWorker(
|
||||
$this->sending_error_handler,
|
||||
$this->stats_notifications_worker,
|
||||
@ -779,7 +779,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
expect($updated_newsletter->hash)->equals($this->newsletter->hash);
|
||||
}
|
||||
|
||||
function testItAllowsSettingCustomBatchSize() {
|
||||
public function testItAllowsSettingCustomBatchSize() {
|
||||
$custom_batch_size_value = 10;
|
||||
$filter = function() use ($custom_batch_size_value) {
|
||||
return $custom_batch_size_value;
|
||||
@ -797,7 +797,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
$wp->removeFilter('mailpoet_cron_worker_sending_queue_batch_size', $filter);
|
||||
}
|
||||
|
||||
function _after() {
|
||||
public function _after() {
|
||||
ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
|
||||
ORM::raw_execute('TRUNCATE ' . SubscriberSegment::$_table);
|
||||
ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table);
|
||||
|
||||
@ -8,7 +8,7 @@ use MailPoet\Models\NewsletterLink;
|
||||
use MailPoetVendor\Idiorm\ORM;
|
||||
|
||||
class LinksTest extends \MailPoetTest {
|
||||
function testItCanSaveLinks() {
|
||||
public function testItCanSaveLinks() {
|
||||
$links = [
|
||||
[
|
||||
'link' => 'http://example.com',
|
||||
@ -25,7 +25,7 @@ class LinksTest extends \MailPoetTest {
|
||||
expect($newsletter_link->url)->equals($links[0]['link']);
|
||||
}
|
||||
|
||||
function testItCanHashAndReplaceLinks() {
|
||||
public function testItCanHashAndReplaceLinks() {
|
||||
$rendered_newsletter = [
|
||||
'html' => '<a href="http://example.com">Example Link</a>',
|
||||
'text' => '<a href="http://example.com">Example Link</a>',
|
||||
@ -40,7 +40,7 @@ class LinksTest extends \MailPoetTest {
|
||||
expect($processed_and_hashed_links[0]['link'])->equals('http://example.com');
|
||||
}
|
||||
|
||||
function testItCanProcessRenderedBody() {
|
||||
public function testItCanProcessRenderedBody() {
|
||||
$newsletter = Newsletter::create();
|
||||
$newsletter->type = Newsletter::TYPE_STANDARD;
|
||||
$newsletter->save();
|
||||
@ -55,7 +55,7 @@ class LinksTest extends \MailPoetTest {
|
||||
expect($result['html'])->contains($newsletter_link->hash);
|
||||
}
|
||||
|
||||
function testItCanEnsureThatUnsubscribeLinkIsAlwaysPresent() {
|
||||
public function testItCanEnsureThatUnsubscribeLinkIsAlwaysPresent() {
|
||||
$newsletter = Newsletter::create();
|
||||
$newsletter->type = Newsletter::TYPE_STANDARD;
|
||||
$newsletter->save();
|
||||
@ -70,7 +70,7 @@ class LinksTest extends \MailPoetTest {
|
||||
expect($unsubscribe_count)->equals(1);
|
||||
}
|
||||
|
||||
function _after() {
|
||||
public function _after() {
|
||||
ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
|
||||
ORM::raw_execute('TRUNCATE ' . NewsletterLink::$_table);
|
||||
}
|
||||
|
||||
@ -23,7 +23,7 @@ class MailerTest extends \MailPoetTest {
|
||||
/** @var SettingsController */
|
||||
private $settings;
|
||||
|
||||
function _before() {
|
||||
public function _before() {
|
||||
parent::_before();
|
||||
$wp_users = get_users();
|
||||
wp_set_current_user($wp_users[0]->ID);
|
||||
@ -36,11 +36,11 @@ class MailerTest extends \MailPoetTest {
|
||||
$this->sender = $this->settings->get('sender');
|
||||
}
|
||||
|
||||
function testConfiguresMailerWhenItConstructs() {
|
||||
public function testConfiguresMailerWhenItConstructs() {
|
||||
expect($this->mailer_task->mailer instanceof \MailPoet\Mailer\Mailer)->true();
|
||||
}
|
||||
|
||||
function testItCanConfigureMailerWithSenderAndReplyToAddresses() {
|
||||
public function testItCanConfigureMailerWithSenderAndReplyToAddresses() {
|
||||
$newsletter = new \stdClass();
|
||||
|
||||
// when no sender/reply-to information is set, use the sender information
|
||||
@ -64,19 +64,19 @@ class MailerTest extends \MailPoetTest {
|
||||
expect($mailer->reply_to['reply_to_email'])->equals($newsletter->reply_to_address);
|
||||
}
|
||||
|
||||
function testItGetsMailerLog() {
|
||||
public function testItGetsMailerLog() {
|
||||
$mailer_log = $this->mailer_task->getMailerLog();
|
||||
expect(is_array($mailer_log))->true();
|
||||
}
|
||||
|
||||
function testItUpdatesMailerLogSentCount() {
|
||||
public function testItUpdatesMailerLogSentCount() {
|
||||
$mailer_log = $this->mailer_task->getMailerLog();
|
||||
expect($mailer_log['sent'])->equals(0);
|
||||
$mailer_log = $this->mailer_task->updateSentCount();
|
||||
expect($mailer_log['sent'])->equals(1);
|
||||
}
|
||||
|
||||
function testItGetsProcessingMethod() {
|
||||
public function testItGetsProcessingMethod() {
|
||||
// when using MailPoet method, newsletters should be processed in bulk
|
||||
$this->settings->set(
|
||||
Mailer::MAILER_CONFIG_SETTING_NAME,
|
||||
@ -99,7 +99,7 @@ class MailerTest extends \MailPoetTest {
|
||||
expect($mailer_task->getProcessingMethod())->equals('individual');
|
||||
}
|
||||
|
||||
function testItCanPrepareSubscriberForSending() {
|
||||
public function testItCanPrepareSubscriberForSending() {
|
||||
$subscriber = Subscriber::create();
|
||||
$subscriber->email = 'test@example.com';
|
||||
$subscriber->first_name = 'John';
|
||||
@ -109,7 +109,7 @@ class MailerTest extends \MailPoetTest {
|
||||
expect($prepared_subscriber)->equals('John Doe <test@example.com>');
|
||||
}
|
||||
|
||||
function testItCanSend() {
|
||||
public function testItCanSend() {
|
||||
$php_mail_class = 'MailPoet\Mailer\Methods\PHPMail';
|
||||
$this->settings->set(
|
||||
Mailer::MAILER_CONFIG_SETTING_NAME,
|
||||
@ -139,7 +139,7 @@ class MailerTest extends \MailPoetTest {
|
||||
expect($mailer_task->send('Newsletter', 'Subscriber'))->true();
|
||||
}
|
||||
|
||||
function _after() {
|
||||
public function _after() {
|
||||
$this->di_container->get(SettingsRepository::class)->truncate();
|
||||
ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
|
||||
}
|
||||
|
||||
@ -43,7 +43,7 @@ class NewsletterTest extends \MailPoetTest {
|
||||
/** @var LoggerFactory */
|
||||
private $logger_factory;
|
||||
|
||||
function _before() {
|
||||
public function _before() {
|
||||
parent::_before();
|
||||
$this->newsletter_task = new NewsletterTask();
|
||||
$this->subscriber = Subscriber::create();
|
||||
@ -71,11 +71,11 @@ class NewsletterTest extends \MailPoetTest {
|
||||
$this->logger_factory = LoggerFactory::getInstance();
|
||||
}
|
||||
|
||||
function testItConstructs() {
|
||||
public function testItConstructs() {
|
||||
expect($this->newsletter_task->tracking_enabled)->true();
|
||||
}
|
||||
|
||||
function testItDoesNotGetNewsletterWhenStatusIsNotActiveOrSending() {
|
||||
public function testItDoesNotGetNewsletterWhenStatusIsNotActiveOrSending() {
|
||||
// draft or any other status return false
|
||||
$newsletter = $this->newsletter;
|
||||
$newsletter->status = Newsletter::STATUS_DRAFT;
|
||||
@ -94,14 +94,14 @@ class NewsletterTest extends \MailPoetTest {
|
||||
expect($this->newsletter_task->getNewsletterFromQueue($this->queue))->isInstanceOf('Mailpoet\Models\Newsletter');
|
||||
}
|
||||
|
||||
function testItDoesNotGetDeletedNewsletter() {
|
||||
public function testItDoesNotGetDeletedNewsletter() {
|
||||
$newsletter = $this->newsletter;
|
||||
$newsletter->set_expr('deleted_at', 'NOW()');
|
||||
$newsletter->save();
|
||||
expect($this->newsletter_task->getNewsletterFromQueue($this->queue))->false();
|
||||
}
|
||||
|
||||
function testItDoesNotGetNewsletterWhenParentNewsletterStatusIsNotActiveOrSending() {
|
||||
public function testItDoesNotGetNewsletterWhenParentNewsletterStatusIsNotActiveOrSending() {
|
||||
// draft or any other status return false
|
||||
$parent_newsletter = $this->parent_newsletter;
|
||||
$parent_newsletter->status = Newsletter::STATUS_DRAFT;
|
||||
@ -132,7 +132,7 @@ class NewsletterTest extends \MailPoetTest {
|
||||
expect($this->newsletter_task->getNewsletterFromQueue($this->queue))->isInstanceOf('Mailpoet\Models\Newsletter');
|
||||
}
|
||||
|
||||
function testItDoesNotGetDeletedNewsletterWhenParentNewsletterIsDeleted() {
|
||||
public function testItDoesNotGetDeletedNewsletterWhenParentNewsletterIsDeleted() {
|
||||
$parent_newsletter = $this->parent_newsletter;
|
||||
$parent_newsletter->set_expr('deleted_at', 'NOW()');
|
||||
$parent_newsletter->save();
|
||||
@ -143,14 +143,14 @@ class NewsletterTest extends \MailPoetTest {
|
||||
expect($this->newsletter_task->getNewsletterFromQueue($this->queue))->false();
|
||||
}
|
||||
|
||||
function testItReturnsNewsletterObjectWhenRenderedNewsletterBodyExistsInTheQueue() {
|
||||
public function testItReturnsNewsletterObjectWhenRenderedNewsletterBodyExistsInTheQueue() {
|
||||
$queue = $this->queue;
|
||||
$queue->newsletter_rendered_body = ['html' => 'test', 'text' => 'test'];
|
||||
$result = $this->newsletter_task->preProcessNewsletter($this->newsletter, $queue);
|
||||
expect($result instanceof \MailPoet\Models\Newsletter)->true();
|
||||
}
|
||||
|
||||
function testItHashesLinksAndInsertsTrackingImageWhenTrackingIsEnabled() {
|
||||
public function testItHashesLinksAndInsertsTrackingImageWhenTrackingIsEnabled() {
|
||||
$wp = Stub::make(new WPFunctions, [
|
||||
'applyFilters' => asCallable([WPHooksHelper::class, 'applyFilters']),
|
||||
]);
|
||||
@ -172,7 +172,7 @@ class NewsletterTest extends \MailPoetTest {
|
||||
expect(WPHooksHelper::getFilterApplied($hook_name)[1] instanceof Newsletter)->true();
|
||||
}
|
||||
|
||||
function testItDoesNotHashLinksAndInsertTrackingCodeWhenTrackingIsDisabled() {
|
||||
public function testItDoesNotHashLinksAndInsertTrackingCodeWhenTrackingIsDisabled() {
|
||||
$wp = Stub::make(new WPFunctions, [
|
||||
'applyFilters' => asCallable([WPHooksHelper::class, 'applyFilters']),
|
||||
]);
|
||||
@ -195,7 +195,7 @@ class NewsletterTest extends \MailPoetTest {
|
||||
expect(WPHooksHelper::getFilterApplied($hook_name)[1] instanceof Newsletter)->true();
|
||||
}
|
||||
|
||||
function testItReturnsFalseAndDeletesNewsletterWhenPostNotificationContainsNoPosts() {
|
||||
public function testItReturnsFalseAndDeletesNewsletterWhenPostNotificationContainsNoPosts() {
|
||||
$newsletter = $this->newsletter;
|
||||
|
||||
$newsletter->type = Newsletter::TYPE_NOTIFICATION_HISTORY;
|
||||
@ -211,7 +211,7 @@ class NewsletterTest extends \MailPoetTest {
|
||||
expect($newsletter)->false();
|
||||
}
|
||||
|
||||
function testItSavesNewsletterPosts() {
|
||||
public function testItSavesNewsletterPosts() {
|
||||
$this->newsletter->type = Newsletter::TYPE_NOTIFICATION_HISTORY;
|
||||
$this->newsletter->parent_id = $this->newsletter->id;
|
||||
$posts_task = $this->make(PostsTask::class, [
|
||||
@ -226,7 +226,7 @@ class NewsletterTest extends \MailPoetTest {
|
||||
expect($newsletter_post->post_id)->equals('10');
|
||||
}
|
||||
|
||||
function testItUpdatesStatusAndSetsSentAtDateOnlyForStandardAndPostNotificationNewsletters() {
|
||||
public function testItUpdatesStatusAndSetsSentAtDateOnlyForStandardAndPostNotificationNewsletters() {
|
||||
$newsletter = $this->newsletter;
|
||||
$queue = new \stdClass();
|
||||
$queue->processed_at = date('Y-m-d H:i:s');
|
||||
@ -258,7 +258,7 @@ class NewsletterTest extends \MailPoetTest {
|
||||
expect($updated_newsletter->status)->notEquals(Newsletter::STATUS_SENT);
|
||||
}
|
||||
|
||||
function testItDoesNotRenderSubscriberShortcodeInSubjectWhenPreprocessingNewsletter() {
|
||||
public function testItDoesNotRenderSubscriberShortcodeInSubjectWhenPreprocessingNewsletter() {
|
||||
$newsletter = $this->newsletter;
|
||||
$newsletter->subject = 'Newsletter for [subscriber:firstname] [date:dordinal]';
|
||||
$queue = $this->queue;
|
||||
@ -269,7 +269,7 @@ class NewsletterTest extends \MailPoetTest {
|
||||
->contains(date_i18n('jS', $wp->currentTime('timestamp')));
|
||||
}
|
||||
|
||||
function testItUsesADefaultSubjectIfRenderedSubjectIsEmptyWhenPreprocessingNewsletter() {
|
||||
public function testItUsesADefaultSubjectIfRenderedSubjectIsEmptyWhenPreprocessingNewsletter() {
|
||||
$newsletter = $this->newsletter;
|
||||
$newsletter->subject = ' [custom_shortcode:should_render_empty] ';
|
||||
$queue = $this->queue;
|
||||
@ -279,7 +279,7 @@ class NewsletterTest extends \MailPoetTest {
|
||||
->equals('No subject');
|
||||
}
|
||||
|
||||
function testItUsesRenderedNewsletterBodyAndSubjectFromQueueObjectWhenPreparingNewsletterForSending() {
|
||||
public function testItUsesRenderedNewsletterBodyAndSubjectFromQueueObjectWhenPreparingNewsletterForSending() {
|
||||
$queue = $this->queue;
|
||||
$queue->newsletter_rendered_body = [
|
||||
'html' => 'queue HTML body',
|
||||
@ -304,7 +304,7 @@ class NewsletterTest extends \MailPoetTest {
|
||||
expect($result['body']['text'])->equals('queue TEXT body');
|
||||
}
|
||||
|
||||
function testItRendersShortcodesAndReplacesSubscriberDataInLinks() {
|
||||
public function testItRendersShortcodesAndReplacesSubscriberDataInLinks() {
|
||||
$newsletter = $this->newsletter_task->preProcessNewsletter($this->newsletter, $this->queue);
|
||||
$result = $this->newsletter_task->prepareNewsletterForSending(
|
||||
$newsletter,
|
||||
@ -318,7 +318,7 @@ class NewsletterTest extends \MailPoetTest {
|
||||
->contains(Router::NAME . '&endpoint=track&action=click&data=');
|
||||
}
|
||||
|
||||
function testItDoesNotReplaceSubscriberDataInLinksWhenTrackingIsNotEnabled() {
|
||||
public function testItDoesNotReplaceSubscriberDataInLinksWhenTrackingIsNotEnabled() {
|
||||
$newsletter_task = $this->newsletter_task;
|
||||
$newsletter_task->tracking_enabled = false;
|
||||
$newsletter = $newsletter_task->preProcessNewsletter($this->newsletter, $this->queue);
|
||||
@ -333,7 +333,7 @@ class NewsletterTest extends \MailPoetTest {
|
||||
->notContains(Router::NAME . '&endpoint=track&action=click&data=');
|
||||
}
|
||||
|
||||
function testItGetsSegments() {
|
||||
public function testItGetsSegments() {
|
||||
for ($i = 1; $i <= 3; $i++) {
|
||||
$newsletter_segment = NewsletterSegment::create();
|
||||
$newsletter_segment->newsletter_id = $this->newsletter->id;
|
||||
@ -345,7 +345,7 @@ class NewsletterTest extends \MailPoetTest {
|
||||
);
|
||||
}
|
||||
|
||||
function testItLogsErrorWhenQueueWithCannotBeSaved() {
|
||||
public function testItLogsErrorWhenQueueWithCannotBeSaved() {
|
||||
$queue = $this->queue;
|
||||
$queue->non_existent_column = true; // this will trigger save error
|
||||
try {
|
||||
@ -358,7 +358,7 @@ class NewsletterTest extends \MailPoetTest {
|
||||
}
|
||||
}
|
||||
|
||||
function testItLogsErrorWhenExistingRenderedNewsletterBodyIsInvalid() {
|
||||
public function testItLogsErrorWhenExistingRenderedNewsletterBodyIsInvalid() {
|
||||
$queue_mock = $this->createMock(SendingTask::class);
|
||||
$queue_mock
|
||||
->expects($this->any())
|
||||
@ -379,7 +379,7 @@ class NewsletterTest extends \MailPoetTest {
|
||||
}
|
||||
}
|
||||
|
||||
function testItLogsErrorWhenNewlyRenderedNewsletterBodyIsInvalid() {
|
||||
public function testItLogsErrorWhenNewlyRenderedNewsletterBodyIsInvalid() {
|
||||
$queue = $this->queue;
|
||||
$queue_mock = $this->createMock(SendingTask::class);
|
||||
$queue_mock
|
||||
@ -410,7 +410,7 @@ class NewsletterTest extends \MailPoetTest {
|
||||
}
|
||||
}
|
||||
|
||||
function testItPreProcessesNewsletterWhenNewlyRenderedNewsletterBodyIsValid() {
|
||||
public function testItPreProcessesNewsletterWhenNewlyRenderedNewsletterBodyIsValid() {
|
||||
$queue = $this->queue;
|
||||
$queue_mock = $this->createMock(SendingTask::class);
|
||||
$queue_mock
|
||||
@ -444,7 +444,7 @@ class NewsletterTest extends \MailPoetTest {
|
||||
expect($newsletter_task->preProcessNewsletter($this->newsletter, $queue_mock))->equals($this->newsletter);
|
||||
}
|
||||
|
||||
function _after() {
|
||||
public function _after() {
|
||||
$this->di_container->get(SettingsRepository::class)->truncate();
|
||||
ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
|
||||
ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
|
||||
|
||||
@ -12,12 +12,12 @@ class PostsTest extends \MailPoetTest {
|
||||
/** @var PostsTask */
|
||||
private $posts_task;
|
||||
|
||||
function _before() {
|
||||
public function _before() {
|
||||
parent::_before();
|
||||
$this->posts_task = new PostsTask;
|
||||
}
|
||||
|
||||
function testItFailsWhenNoPostsArePresent() {
|
||||
public function testItFailsWhenNoPostsArePresent() {
|
||||
$newsletter = (object)[
|
||||
'id' => 1,
|
||||
'type' => Newsletter::TYPE_NOTIFICATION_HISTORY,
|
||||
@ -28,7 +28,7 @@ class PostsTest extends \MailPoetTest {
|
||||
expect($this->posts_task->extractAndSave($rendered_newsletter, $newsletter))->equals(false);
|
||||
}
|
||||
|
||||
function testItCanExtractAndSavePosts() {
|
||||
public function testItCanExtractAndSavePosts() {
|
||||
$post_id = 10;
|
||||
$newsletter = (object)[
|
||||
'id' => 2,
|
||||
@ -44,7 +44,7 @@ class PostsTest extends \MailPoetTest {
|
||||
expect($newsletter_post->post_id)->equals($post_id);
|
||||
}
|
||||
|
||||
function testItDoesNotSavePostsWhenNewsletterIsNotANotificationHistory() {
|
||||
public function testItDoesNotSavePostsWhenNewsletterIsNotANotificationHistory() {
|
||||
$post_id = 10;
|
||||
$newsletter = (object)[
|
||||
'id' => 2,
|
||||
@ -59,7 +59,7 @@ class PostsTest extends \MailPoetTest {
|
||||
expect($this->posts_task->extractAndSave($rendered_newsletter, $newsletter))->equals(false);
|
||||
}
|
||||
|
||||
function _after() {
|
||||
public function _after() {
|
||||
ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table);
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@ use MailPoet\Models\Subscriber;
|
||||
use MailPoetVendor\Idiorm\ORM;
|
||||
|
||||
class ShortcodesTest extends \MailPoetTest {
|
||||
function _before() {
|
||||
public function _before() {
|
||||
parent::_before();
|
||||
$this->WP_post = wp_insert_post(
|
||||
[
|
||||
@ -20,7 +20,7 @@ class ShortcodesTest extends \MailPoetTest {
|
||||
);
|
||||
}
|
||||
|
||||
function testItCanReplaceShortcodes() {
|
||||
public function testItCanReplaceShortcodes() {
|
||||
$queue = $newsletter = (object)[
|
||||
'id' => 1,
|
||||
];
|
||||
@ -35,7 +35,7 @@ class ShortcodesTest extends \MailPoetTest {
|
||||
expect($result)->equals('John Doe');
|
||||
}
|
||||
|
||||
function testItCanReplaceShortcodesInOneStringUsingContentsFromAnother() {
|
||||
public function testItCanReplaceShortcodesInOneStringUsingContentsFromAnother() {
|
||||
$wp_post = get_post($this->WP_post);
|
||||
$content = 'Subject line with one shortcode: [newsletter:post_title]';
|
||||
$content_source = '<a data-post-id="' . $this->WP_post . '" href="#">latest post</a>';
|
||||
@ -48,7 +48,7 @@ class ShortcodesTest extends \MailPoetTest {
|
||||
expect(Shortcodes::process($content, $content_source))->equals('Subject line with one shortcode: ' . $wp_post->post_title);
|
||||
}
|
||||
|
||||
function _after() {
|
||||
public function _after() {
|
||||
ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
|
||||
ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
|
||||
wp_delete_post($this->WP_post, true);
|
||||
|
||||
Reference in New Issue
Block a user