Bump up release version to 0.0.45

Updated text

lib/Cron/Workers/Scheduler.php

@@ -26,7 +26,7 @@ class Scheduler {
 
   function process() {
     $scheduled_queues = self::getScheduledQueues();
-    if(!count($scheduled_queues)) return;
+    if(!count($scheduled_queues)) return false;
     foreach($scheduled_queues as $i => $queue) {
       $newsletter = Newsletter::filter('filterWithOptions')
         ->findOne($queue->newsletter_id);
@@ -47,30 +47,30 @@ class Scheduler {
     $subscriber = unserialize($queue->subscribers);
     if(empty($subscriber['to_process'][0])) {
       $queue->delete();
-      return;
+      return false;
     }
     $subscriber_id = (int)$subscriber['to_process'][0];
     if($newsletter->event === 'segment') {
-      if($this->verifyMailPoetSubscriber($subscriber_id, $newsletter, $queue) === false) {
+      if($this->verifyMailpoetSubscriber($subscriber_id, $newsletter, $queue) === false) {
-        return;
+        return false;
       }
     } else {
       if($newsletter->event === 'user') {
         if($this->verifyWPSubscriber($subscriber_id, $newsletter, $queue) === false) {
-          return;
+          return false;
         }
       }
     }
     $queue->status = null;
     $queue->save();
+    return true;
   }
 
   function processPostNotificationNewsletter($newsletter, $queue) {
     // ensure that segments exist
     $segments = $newsletter->segments()->findArray();
     if(empty($segments)) {
-      $this->deleteQueueOrUpdateNextRunDate($queue, $newsletter);
+      return $this->deleteQueueOrUpdateNextRunDate($queue, $newsletter);
-      return;
     }
     $segment_ids = array_map(function($segment) {
       return (int)$segment['id'];
@@ -83,13 +83,12 @@ class Scheduler {
     $subscribers = array_unique($subscribers);
 
     if(empty($subscribers)) {
-      $this->deleteQueueOrUpdateNextRunDate($queue, $newsletter);
+      return $this->deleteQueueOrUpdateNextRunDate($queue, $newsletter);
-      return;
     }
 
     // create a duplicate newsletter that acts as a history record
     $notification_history = $this->createNotificationHistory($newsletter->id);
-    if(!$notification_history) return;
+    if(!$notification_history) return false;
 
     // queue newsletter for delivery
     $queue->newsletter_id = $notification_history->id;
@@ -101,6 +100,7 @@ class Scheduler {
     $queue->count_total = $queue->count_to_process = count($subscribers);
     $queue->status = null;
     $queue->save();
+    return true;
   }
 
   function processScheduledStandardNewsletter($newsletter, $queue) {
@@ -108,7 +108,6 @@ class Scheduler {
     $segment_ids = array_map(function($segment) {
       return $segment['id'];
     }, $segments);
-
     $subscribers = Subscriber::getSubscribedInSegments($segment_ids)
       ->findArray();
     $subscribers = Helpers::arrayColumn($subscribers, 'subscriber_id');
@@ -123,9 +122,10 @@ class Scheduler {
     $queue->count_total = $queue->count_to_process = count($subscribers);
     $queue->status = null;
     $queue->save();
+    return true;
   }
 
-  function verifyMailPoetSubscriber($subscriber_id, $newsletter, $queue) {
+  function verifyMailpoetSubscriber($subscriber_id, $newsletter, $queue) {
     $subscriber = Subscriber::findOne($subscriber_id);
     // check if subscriber is in proper segment
     $subscriber_in_segment =
@@ -184,7 +184,7 @@ class Scheduler {
       $notification_history :
       false;
   }
-  
+
   static function getScheduledQueues() {
     return SendingQueue::where('status', 'scheduled')
       ->whereLte('scheduled_at', Carbon::createFromTimestamp(current_time('timestamp')))

mailpoet.php

@@ -4,7 +4,7 @@ if(!defined('ABSPATH')) exit;
 use \MailPoet\Config\Initializer;
 /*
  * Plugin Name: MailPoet
- * Version: 0.0.44
+ * Version: 0.0.45
  * Plugin URI: http://www.mailpoet.com
  * Description: MailPoet Newsletters.
  * Author: MailPoet
@@ -22,7 +22,7 @@ use \MailPoet\Config\Initializer;
 
 require 'vendor/autoload.php';
 
-define('MAILPOET_VERSION', '0.0.44');
+define('MAILPOET_VERSION', '0.0.45');
 
 $initializer = new Initializer(array(
   'file' => __FILE__,

tests/unit/Cron/Workers/SchedulerTest.php

@@ -0,0 +1,608 @@
+<?php
+
+use Carbon\Carbon;
+use Codeception\Util\Stub;
+use MailPoet\API\Endpoints\Cron;
+use MailPoet\Cron\CronHelper;
+use MailPoet\Cron\Workers\Scheduler;
+use MailPoet\Models\Newsletter;
+use MailPoet\Models\NewsletterOption;
+use MailPoet\Models\NewsletterOptionField;
+use MailPoet\Models\NewsletterSegment;
+use MailPoet\Models\Segment;
+use MailPoet\Models\SendingQueue;
+use MailPoet\Models\Setting;
+use MailPoet\Models\Subscriber;
+use MailPoet\Models\SubscriberSegment;
+
+class SchedulerTest extends MailPoetTest {
+  function testItDefinesConstants() {
+    expect(Scheduler::UNCONFIRMED_SUBSCRIBER_RESCHEDULE_TIMEOUT)->equals(5);
+  }
+
+  function testItConstructs() {
+    $scheduler = new Scheduler();
+    expect($scheduler->timer)->greaterOrEquals(5);
+    $timer = microtime(true) - 2;
+    $scheduler = new Scheduler($timer);
+    expect($scheduler->timer)->equals($timer);
+  }
+
+  function testItThrowsExceptionWhenExecutionLimitIsReached() {
+    try {
+      $scheduler = new Scheduler(microtime(true) - CronHelper::DAEMON_EXECUTION_LIMIT);
+      self::fail('Maximum execution time limit exception was not thrown.');
+    } catch(\Exception $e) {
+      expect($e->getMessage())->equals('Maximum execution time has been reached.');
+    }
+  }
+
+  function testItCanGetScheduledQueues() {
+    expect(Scheduler::getScheduledQueues())->isEmpty();
+    $queue = SendingQueue::create();
+    $queue->newsletter_id = 1;
+    $queue->status = SendingQueue::STATUS_SCHEDULED;
+    $queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
+    $queue->save();
+    expect(Scheduler::getScheduledQueues())->notEmpty();
+  }
+
+  function testItCanCreateNotificationHistory() {
+    $newsletter = Newsletter::create();
+    $newsletter->type = Newsletter::TYPE_NOTIFICATION;
+    $newsletter->save();
+
+    // ensure that notification history does not exist
+    $notification_history = Newsletter::where('type', Newsletter::TYPE_NOTIFICATION_HISTORY)
+      ->where('parent_id', $newsletter->id)
+      ->findOne();
+    expect($notification_history)->isEmpty();
+
+    // create notification history and ensure that it exists
+    $scheduler = new Scheduler();
+    $scheduler->createNotificationHistory($newsletter->id);
+    $notification_history = Newsletter::where('type', Newsletter::TYPE_NOTIFICATION_HISTORY)
+      ->where('parent_id', $newsletter->id)
+      ->findOne();
+    expect($notification_history)->notEmpty();
+  }
+
+  function testItCanDeleteQueueOrChangeItsNextRunDate() {
+    $WP_user = $this->_createOrUpdateWPUser('editor');
+    $newsletter = $this->_createNewsletter();
+    $newsletter_option_field = $this->_createNewsletterOptionField('intervalType', Newsletter::TYPE_WELCOME);
+    $newsletter_option = $this->_createNewsletterOption($newsletter_option_field->id, $newsletter->id, 'immediately');
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $queue = $this->_createQueue($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // queue should be deleted when interval type is set to "immediately"
+    expect(SendingQueue::findMany())->notEmpty();
+    $scheduler->deleteQueueOrUpdateNextRunDate($queue, $newsletter);
+    expect(count(SendingQueue::findMany()))->equals(0);
+
+    // queue's next run date should change when interval type is set to anything
+    // other than "immediately"
+    $queue = $this->_createQueue($newsletter->id);
+    $newsletter_option->value = 'daily';
+    $newsletter_option->save();
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    expect($queue->scheduled_at)->null();
+    $newsletter->schedule = '0 5 * * *'; // set it to daily at 5
+    $scheduler->deleteQueueOrUpdateNextRunDate($queue, $newsletter);
+    $queue = SendingQueue::findOne($queue->id);
+    expect($queue->scheduled_at)->notNull();
+  }
+
+  function testItFailsWPSubscriberVerificationWhenSubscriberIsNotAWPUser() {
+    $WP_user = $this->_createOrUpdateWPUser('editor');
+    $subscriber = $this->_createSubscriber();
+    $newsletter = $this->_createNewsletter(Newsletter::TYPE_WELCOME);
+    $newsletter_option_field = $this->_createNewsletterOptionField(
+      'role',
+      Newsletter::TYPE_WELCOME
+    );
+    $newsletter_option = $this->_createNewsletterOption(
+      $newsletter_option_field->id,
+      $newsletter->id, 'author'
+    );
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $queue = $this->_createQueue($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // return false and delete queue when subscriber is not a WP user
+    $result = $scheduler->verifyWPSubscriber($subscriber->id, $newsletter, $queue);
+    expect($result)->false();
+    expect(count(SendingQueue::findMany()))->equals(0);
+  }
+
+  function testItFailsWPSubscriberVerificationWhenSubscriberRoleDoesNotMatch() {
+    $WP_user = $this->_createOrUpdateWPUser('editor');
+    $subscriber = $this->_createSubscriber($WP_user->ID);
+    $newsletter = $this->_createNewsletter(Newsletter::TYPE_WELCOME);
+    $newsletter_option_field = $this->_createNewsletterOptionField(
+      'role',
+      Newsletter::TYPE_WELCOME
+    );
+    $newsletter_option = $this->_createNewsletterOption(
+      $newsletter_option_field->id,
+      $newsletter->id, 'author'
+    );
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $queue = $this->_createQueue($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // return false and delete queue when subscriber role is different from the one
+    // specified for the welcome email
+    $result = $scheduler->verifyWPSubscriber($subscriber->id, $newsletter, $queue);
+    expect($result)->false();
+    expect(count(SendingQueue::findMany()))->equals(0);
+  }
+
+  function testItPassesWPSubscriberVerificationWhenSubscriberExistsAndRoleMatches() {
+    $WP_user = $this->_createOrUpdateWPUser('author');
+    $subscriber = $this->_createSubscriber($WP_user->ID);
+    $newsletter = $this->_createNewsletter(Newsletter::TYPE_WELCOME);
+    $newsletter_option_field =
+      $this->_createNewsletterOptionField('role', Newsletter::TYPE_WELCOME);
+    $newsletter_option = $this->_createNewsletterOption(
+      $newsletter_option_field->id,
+      $newsletter->id, 'author'
+    );
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $queue = $this->_createQueue($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // return true when user exists and WP role matches the one specified for the welcome email
+    $result = $scheduler->verifyWPSubscriber($subscriber->id, $newsletter, $queue);
+    expect($result)->true();
+    expect(count(SendingQueue::findMany()))->greaterOrEquals(1);
+  }
+
+  function testItPassesWPSubscriberVerificationWhenSubscriberHasAnyRole() {
+    $WP_user = $this->_createOrUpdateWPUser('author');
+    $subscriber = $this->_createSubscriber($WP_user->ID);
+    $newsletter = $this->_createNewsletter(Newsletter::TYPE_WELCOME);
+    $newsletter_option_field =
+      $this->_createNewsletterOptionField('role', Newsletter::TYPE_WELCOME);
+    $newsletter_option = $this->_createNewsletterOption(
+      $newsletter_option_field->id, $newsletter->id,
+      \MailPoet\Newsletter\Scheduler\Scheduler::WORDPRESS_ALL_ROLES);
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $queue = $this->_createQueue($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // true when user exists and has any role
+    $result = $scheduler->verifyWPSubscriber($subscriber->id, $newsletter, $queue);
+    expect($result)->true();
+    expect(count(SendingQueue::findMany()))->greaterOrEquals(1);
+  }
+
+  function testItDoesNotProcessWelcomeNewsletterWhenThereAreNoSubscribersToProcess() {
+    $newsletter = $this->_createNewsletter();
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->subscribers = serialize(array());
+
+    // delete queue when the list of subscribers to process is blank
+    $scheduler = new Scheduler();
+    $result = $scheduler->processWelcomeNewsletter($newsletter, $queue);
+    expect($result)->false();
+    expect(count(SendingQueue::findMany()))->equals(0);
+  }
+
+  function testItDoesNotProcessWelcomeNewsletterWhenWPUserCannotBeVerified() {
+    $newsletter = $this->_createNewsletter();
+    $newsletter->event = 'user';
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->subscribers = serialize(array('to_process' => array(1)));
+
+    // return false when WP user cannot be verified
+    $scheduler = Stub::make(new Scheduler(), array(
+      'verifyWPSubscriber' => Stub::exactly(1, function() { return false; })
+    ), $this);
+    expect($scheduler->processWelcomeNewsletter($newsletter, $queue))->false();
+  }
+
+  function testItDoesNotProcessWelcomeNewsletterWhenSubscriberCannotBeVerified() {
+    $newsletter = $this->_createNewsletter();
+    $newsletter->event = 'segment';
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->subscribers = serialize(array('to_process' => array(1)));
+
+    // return false when subscriber cannot be verified
+    $scheduler = Stub::make(new Scheduler(), array(
+      'verifyMailpoetSubscriber' => Stub::exactly(1, function() { return false; })
+    ), $this);
+    expect($scheduler->processWelcomeNewsletter($newsletter, $queue))->false();
+  }
+
+  function testItProcessesWelcomeNewsletterWhenSubscriberIsVerified() {
+    $newsletter = $this->_createNewsletter();
+    $newsletter->event = 'segment';
+
+    // return true when subsriber is verified and update the queue's status to null
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->subscribers = serialize(array('to_process' => array(1)));
+    $scheduler = Stub::make(new Scheduler(), array(
+      'verifyMailpoetSubscriber' => Stub::exactly(1, function() { })
+    ), $this);
+    expect($queue->status)->notNull();
+    expect($scheduler->processWelcomeNewsletter($newsletter, $queue))->true();
+    $updated_queue = SendingQueue::findOne($queue->id);
+    expect($updated_queue->status)->null();
+  }
+
+  function testItProcessesWelcomeNewsletterWhenWPUserIsVerified() {
+    $newsletter = $this->_createNewsletter();
+    $newsletter->event = 'user';
+
+    // return true when WP user is verified
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->subscribers = serialize(array('to_process' => array(1)));
+    $scheduler = Stub::make(new Scheduler(), array(
+      'verifyWPSubscriber' => Stub::exactly(1, function() { })
+    ), $this);
+    expect($queue->status)->notNull();
+    expect($scheduler->processWelcomeNewsletter($newsletter, $queue))->true();
+    // update queue's status to null
+    $updated_queue = SendingQueue::findOne($queue->id);
+    expect($updated_queue->status)->null();
+  }
+
+  function testItFailsMailpoetSubscriberVerificationWhenSubscriberDoesNotExist() {
+    $scheduler = new Scheduler();
+    $newsletter = $this->_createNewsletter();
+    $queue = $this->_createQueue($newsletter->id);
+
+    // return false
+    $result = $scheduler->verifyMailpoetSubscriber(null, $newsletter, $queue);
+    expect($result)->false();
+    // delete queue when subscriber can't be found
+    expect(count(SendingQueue::findMany()))->equals(0);
+  }
+
+  function testItFailsMailpoetSubscriberVerificationWhenSubscriberIsNotInSegment() {
+    $subscriber = $this->_createSubscriber();
+    $segment = $this->_createSegment();
+    $newsletter = $this->_createNewsletter();
+    $newsletter_option_field = $this->_createNewsletterOptionField('segment', Newsletter::TYPE_NOTIFICATION);
+    $newsletter_option = $this->_createNewsletterOption($newsletter_option_field->id, $newsletter->id, $segment->id);
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $queue = $this->_createQueue($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // return false
+    $result = $scheduler->verifyMailpoetSubscriber($subscriber->id, $newsletter, $queue);
+    expect($result)->false();
+    // delete queue when subscriber is not in segment specified for the newsletter
+    expect(count(SendingQueue::findMany()))->equals(0);
+  }
+
+  function testItReschedulesQueueDeliveryWhenMailpoetSubscriberHasNotConfirmedSubscription() {
+    $subscriber = $this->_createSubscriber($wp_user_id = null, 'unsubscribed');
+    $segment = $this->_createSegment();
+    $subscriber_segment = $this->_createSubscriberSegment($subscriber->id, $segment->id);
+    $newsletter = $this->_createNewsletter();
+    $newsletter_option_field =
+      $this->_createNewsletterOptionField('segment', Newsletter::TYPE_NOTIFICATION);
+    $newsletter_option = $this->_createNewsletterOption(
+      $newsletter_option_field->id, $newsletter->id,
+      $segment->id
+    );
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $queue = $this->_createQueue($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // return false
+    $result = $scheduler->verifyMailpoetSubscriber($subscriber->id, $newsletter, $queue);
+    expect($result)->false();
+    // update the time queue is scheduled to run at
+    $updated_queue = SendingQueue::findOne($queue->id);
+    expect(Carbon::parse($updated_queue->scheduled_at))->equals(
+      Carbon::now()
+        ->addMinutes(Scheduler::UNCONFIRMED_SUBSCRIBER_RESCHEDULE_TIMEOUT)
+    );
+  }
+
+  function testItCanVerifyMailpoetSubscriber() {
+    $subscriber = $this->_createSubscriber();
+    $segment = $this->_createSegment();
+    $subscriber_segment = $this->_createSubscriberSegment($subscriber->id, $segment->id);
+    $newsletter = $this->_createNewsletter();
+    $newsletter_option_field =
+      $this->_createNewsletterOptionField('segment', Newsletter::TYPE_NOTIFICATION);
+    $newsletter_option = $this->_createNewsletterOption(
+      $newsletter_option_field->id, $newsletter->id,
+      $segment->id
+    );
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $queue = $this->_createQueue($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // return true after successful verification
+    $result = $scheduler->verifyMailpoetSubscriber($subscriber->id, $newsletter, $queue);
+    expect($result)->true();
+  }
+
+  function testItProcessesScheduledStandardNewsletter() {
+    $subscriber = $this->_createSubscriber();
+    $segment = $this->_createSegment();
+    $subscriber_segment = $this->_createSubscriberSegment($subscriber->id, $segment->id);
+    $newsletter = $this->_createNewsletter();
+    $newsletter_segment = $this->_createNewsletterSegment($newsletter->id, $segment->id);
+    $newsletter_option_field =
+      $this->_createNewsletterOptionField('segment', Newsletter::TYPE_NOTIFICATION);
+    $newsletter_option = $this->_createNewsletterOption(
+      $newsletter_option_field->id, $newsletter->id,
+      $segment->id
+    );
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $queue = $this->_createQueue($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // return true
+    expect($scheduler->processScheduledStandardNewsletter($newsletter, $queue))->true();
+    // update queue's list of subscribers to process
+    $updated_queue = SendingQueue::findOne($queue->id);
+    $updated_queue_subscribers = $updated_queue->getSubscribers();
+    expect($updated_queue_subscribers['to_process'])->equals(array($subscriber->id));
+    // set queue's status to null
+    expect($updated_queue->status)->null();
+  }
+
+  function testItFailsToProcessPostNotificationNewsletterWhenSegmentsDontExist() {
+    $newsletter = $this->_createNewsletter();
+    $queue = $this->_createQueue($newsletter->id);
+
+    // delete or reschedule queue when segments don't exist
+    $scheduler = Stub::make(new Scheduler(), array(
+      'deleteQueueOrUpdateNextRunDate' => Stub::exactly(1, function() { return false; })
+    ), $this);
+    expect($scheduler->processPostNotificationNewsletter($newsletter, $queue))->false();
+  }
+
+  function testItFailsToProcessPostNotificationNewsletterWhenSubscribersNotInSegment() {
+    $newsletter = $this->_createNewsletter();
+    $queue = $this->_createQueue($newsletter->id);
+    $segment = $this->_createSegment();
+    $newsletter_segment = $this->_createNewsletterSegment($newsletter->id, $segment->id);
+
+    // delete or reschedule queue when there are no subscribers in segments
+    $scheduler = Stub::make(new Scheduler(), array(
+      'deleteQueueOrUpdateNextRunDate' => Stub::exactly(1, function() { return false; })
+    ), $this);
+    expect($scheduler->processPostNotificationNewsletter($newsletter, $queue))->false();
+  }
+
+  function testItCanProcessPostNotificationNewsletter() {
+    $newsletter = $this->_createNewsletter();
+    $queue = $this->_createQueue($newsletter->id);
+    $segment = $this->_createSegment();
+    $newsletter_segment = $this->_createNewsletterSegment($newsletter->id, $segment->id);
+    $subscriber = $this->_createSubscriber();
+    $subscriber_segment = $this->_createSubscriberSegment($subscriber->id, $segment->id);
+    $newsletter_option_field =
+      $this->_createNewsletterOptionField('segment', Newsletter::TYPE_NOTIFICATION);
+    $newsletter_option = $this->_createNewsletterOption(
+      $newsletter_option_field->id, $newsletter->id,
+      $segment->id
+    );
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // return true
+    expect($scheduler->processPostNotificationNewsletter($newsletter, $queue))->true();
+    // create notification history
+    $notification_history = Newsletter::where('parent_id', $newsletter->id)
+      ->findOne();
+    expect($notification_history)->notEmpty();
+    // update queue with a list of subscribers to process and change newsletter id
+    // to that of the notification history
+    $updated_queue = SendingQueue::findOne($queue->id);
+    $updated_queue_subscribers = $updated_queue->getSubscribers();
+    expect($updated_queue_subscribers['to_process'])->equals(array($subscriber->id));
+    expect($updated_queue->newsletter_id)->equals($notification_history->id);
+  }
+
+  function testItFailsToProcessWhenScheduledQueuesNotFound() {
+    $scheduler = new Scheduler();
+    expect($scheduler->process())->false();
+  }
+
+  function testItDeletesQueueDuringProcessingWhenNewsletterNotFound() {
+    $queue = $this->_createQueue(1);
+    $queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
+    $queue->save();
+    $scheduler = new Scheduler();
+    $scheduler->process();
+    expect(count(SendingQueue::findMany()))->equals(0);
+  }
+
+  function testItDeletesQueueDuringProcessingWhenNewsletterIsSoftDeleted() {
+    $newsletter = $this->_createNewsletter();
+    $newsletter->deleted_at = Carbon::createFromTimestamp(current_time('timestamp'));
+    $newsletter->save();
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
+    $queue->save();
+    $scheduler = new Scheduler();
+    $scheduler->process();
+    expect(count(SendingQueue::findMany()))->equals(0);
+  }
+
+  function testItProcessesWelcomeNewsletters() {
+    $newsletter = $this->_createNewsletter(Newsletter::TYPE_WELCOME);
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
+    $queue->save();
+    $scheduler = Stub::make(new Scheduler(), array(
+      'processWelcomeNewsletter' => Stub::exactly(1, function($newsletter, $queue) { })
+    ), $this);
+    $scheduler->timer = microtime(true);
+    $scheduler->process();
+  }
+
+  function testItProcessesNotificationNewsletters() {
+    $newsletter = $this->_createNewsletter();
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
+    $queue->save();
+    $scheduler = Stub::make(new Scheduler(), array(
+      'processPostNotificationNewsletter' => Stub::exactly(1, function($newsletter, $queue) { })
+    ), $this);
+    $scheduler->timer = microtime(true);
+    $scheduler->process();
+  }
+
+  function testItProcessesStandardScheduledNewsletters() {
+    $newsletter = $this->_createNewsletter(Newsletter::TYPE_STANDARD);
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
+    $queue->save();
+    $scheduler = Stub::make(new Scheduler(), array(
+      'processScheduledStandardNewsletter' => Stub::exactly(1, function($newsletter, $queue) { })
+    ), $this);
+    $scheduler->timer = microtime(true);
+    $scheduler->process();
+  }
+
+  function testItEnforcesExecutionLimitDuringProcessing() {
+    $newsletter = $this->_createNewsletter();
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
+    $queue->save();
+    $scheduler = Stub::make(new Scheduler(), array(
+      'processPostNotificationNewsletter' => Stub::exactly(1, function($newsletter, $queue) { })
+    ), $this);
+    $scheduler->timer = microtime(true) - CronHelper::DAEMON_EXECUTION_LIMIT;
+    try {
+      $scheduler->process();
+      self::fail('Maximum execution time limit exception was not thrown.');
+    } catch(\Exception $e) {
+      expect($e->getMessage())->equals('Maximum execution time has been reached.');
+    }
+  }
+
+  function _createNewsletterSegment($newsletter_id, $segment_id) {
+    $newsletter_segment = NewsletterSegment::create();
+    $newsletter_segment->newsletter_id = $newsletter_id;
+    $newsletter_segment->segment_id = $segment_id;
+    $newsletter_segment->save();
+    expect($newsletter_segment->getErrors())->false();
+    return $newsletter_segment;
+  }
+
+  function _createSubscriberSegment($subscriber_id, $segment_id, $status = 'subscribed') {
+    $subscriber_segment = SubscriberSegment::create();
+    $subscriber_segment->subscriber_id = $subscriber_id;
+    $subscriber_segment->segment_id = $segment_id;
+    $subscriber_segment->status = $status;
+    $subscriber_segment->save();
+    expect($subscriber_segment->getErrors())->false();
+    return $subscriber_segment;
+  }
+
+
+  function _createSegment() {
+    $segment = Segment::create();
+    $segment->name = 'test';
+    $segment->type = 'default';
+    $segment->save();
+    expect($segment->getErrors())->false();
+    return $segment;
+  }
+
+  function _createSubscriber($wp_user_id = null, $status = 'subscribed') {
+    $subscriber = Subscriber::create();
+    $subscriber->email = 'john@doe.com';
+    $subscriber->first_name = 'John';
+    $subscriber->last_name = 'Doe';
+    $subscriber->wp_user_id = $wp_user_id;
+    $subscriber->status = $status;
+    $subscriber->save();
+    expect($subscriber->getErrors())->false();
+    return $subscriber;
+  }
+
+  function _createNewsletter($type = Newsletter::TYPE_NOTIFICATION) {
+    $newsletter = Newsletter::create();
+    $newsletter->type = $type;
+    $newsletter->save();
+    expect($newsletter->getErrors())->false();
+    return $newsletter;
+  }
+
+  function _createNewsletterOptionField($name, $type) {
+    $newsletter_option_field = NewsletterOptionField::create();
+    $newsletter_option_field->name = $name;
+    $newsletter_option_field->newsletter_type = $type;
+    $newsletter_option_field->save();
+    expect($newsletter_option_field->getErrors())->false();
+    return $newsletter_option_field;
+  }
+
+  function _createNewsletterOption($option_field_id, $newsletter_id, $value) {
+    $newsletter_option = NewsletterOption::create();
+    $newsletter_option->option_field_id = $option_field_id;
+    $newsletter_option->newsletter_id = $newsletter_id;
+    $newsletter_option->value = $value;
+    $newsletter_option->save();
+    expect($newsletter_option->getErrors())->false();
+    return $newsletter_option;
+  }
+
+  function _createQueue($newsletter_id, $status = SendingQueue::STATUS_SCHEDULED) {
+    $queue = SendingQueue::create();
+    $queue->status = $status;
+    $queue->newsletter_id = $newsletter_id;
+    $queue->save();
+    expect($queue->getErrors())->false();
+    return $queue;
+  }
+
+  function _createOrUpdateWPUser($role = null) {
+    $email = 'test@example.com';
+    $username = 'phoenix_test_user';
+    if(email_exists($email) === false) {
+      wp_insert_user(
+        array(
+          'user_login' => $username,
+          'user_email' => $email,
+          'user_pass' => null
+        )
+      );
+    }
+    $user = get_user_by('login', $username);
+    wp_update_user(
+      array(
+        'ID' => $user->ID,
+        'role' => $role
+      )
+    );
+    expect($user->ID)->notNull();
+    return $user;
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
+    ORM::raw_execute('TRUNCATE ' . Setting::$_table);
+    ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
+    ORM::raw_execute('TRUNCATE ' . NewsletterOption::$_table);
+    ORM::raw_execute('TRUNCATE ' . NewsletterOptionField::$_table);
+    ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
+    ORM::raw_execute('TRUNCATE ' . SubscriberSegment::$_table);
+    ORM::raw_execute('TRUNCATE ' . Segment::$_table);
+    ORM::raw_execute('TRUNCATE ' . NewsletterSegment::$_table);
+  }
+}

views/newsletters.html

@@ -105,7 +105,7 @@
     'regularNewsletterTypeDescription': __('Send a newsletter with images, buttons, dividers, and social bookmarks. Or, just send a basic text email.'),
     'create': __('Create'),
     'welcomeNewsletterTypeTitle': __('Welcome Email'),
-    'welcomeNewsletterTypeDescription': __('Send an email to new users'),
+    'welcomeNewsletterTypeDescription': __('Automatically send an email (or series of emails) to new subscribers or WordPress users. Send a day, a week, or a month after they sign up.'),
     'setUp': __('Set up'),
     'postNotificationNewsletterTypeTitle': __('Post Notifications'),
     'postNotificationsNewsletterTypeDescription': __('Automatically send posts immediately, daily, weekly or monthly. Filter by categories, if you like.'),

views/subscribers/importExport/import/step1.html

@@ -76,7 +76,7 @@
         <tr>
           <th scope="row">
             <label for="mailchimp_key">
-              <%= __('Enter you MailChimp API key') %>
+              <%= __('Enter your MailChimp API key') %>
             </label>
           </th>
           <td>

views/subscribers/subscribers.html

@@ -18,9 +18,9 @@
     'searchLabel': __('Search'),
     'loadingItems': __('Loading subscribers...'),
     'noItemsFound': __('No subscribers were found'),
-    'selectAllLabel': __('All subscribers on this page are selected'),
+    'selectAllLabel': __('All subscribers on this page are selected.'),
     'selectedAllLabel': __('All %d subscribers are selected'),
-    'selectAllLink': __('Select all subscribers on all pages'),
+    'selectAllLink': __('Select all subscribers on all pages.'),
     'clearSelection': __('Clear selection'),
     'permanentlyDeleted': __('%d subscribers were permanently deleted'),
     'selectBulkAction': __('Select bulk action'),

views/update.html

@@ -23,6 +23,12 @@
 
   <div id="mailpoet-changelog" clas="feature-section one-col">
     <h2><%= __("List of Changes") %></h2>
+    <h3>0.0.45 - 2016-09-20</h3>
+    <ul>
+      <li>Refactored Cron Scheduler worker and added unit tests;</li>
+      <li>Fixed some language strings.</li>
+    </ul>
+    <br>
     <h3>0.0.44 - 2016-09-13</h3>
     <ul>
       <li>Updated API response formats for Forms, Newsletters, Segments, Subscribers;</li>
@@ -33,20 +39,6 @@
       <li>Added a subscribers limit of 2000 subscribers.</li>
     </ul>
     <br>
-    <h3>0.0.43 - 2016-09-06</h3>
-    <ul>
-      <li>Fixed cron to run on sites behind proxy or running inside VMs where host and guest ports are different;</li>
-      <li>Updated Welcome and Update pages;</li>
-      <li>Added logging of plugin installation timestamp;</li>
-      <li>Added Cron Trigger and Cron Supervisor tests;</li>
-      <li>Removed Cron menu page;</li>
-      <li>Added 3 new sample newsletter templates;</li>
-      <li>Newsletter Editor: Changed Trash and Move icons to new ones and swapped default/hover colors for block tools;</li>
-      <li>Newsletter Editor: Clarified label of preheader input field;</li>
-      <li>Newsletter Editor: Added animation to display/hide block tools on mouse hover;</li>
-      <li>Changed newsletter template description text to not be partially cut off.</li>
-    </ul>
-    <br>
 
   </div>