From 7a2aaa86cf25a22e09418b39223f2a3b99d0357d Mon Sep 17 00:00:00 2001
From: Vlad <site.github@mrcasual.com>
Date: Tue, 11 Jul 2017 09:12:43 -0400
Subject: [PATCH] Tests that populator method is not run for versions below
 3.0.0-beta.36.2.1

---
 lib/Config/Populator.php            | 12 +++++++++---
 tests/unit/Config/PopulatorTest.php | 12 +++++++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/lib/Config/Populator.php b/lib/Config/Populator.php
index 569003abf3..7a4dbe81e0 100644
--- a/lib/Config/Populator.php
+++ b/lib/Config/Populator.php
@@ -340,7 +340,7 @@ class Populator {
     if(!version_compare(get_option('mailpoet_db_version'), '3.0.0-beta.32', '<=')) {
       // Data conversion should only be performed only once, when migrating from
       // older version
-      return;
+      return false;
     }
 
     $source_charset = $wpdb->get_var('SELECT @@GLOBAL.character_set_connection');
@@ -389,6 +389,8 @@ class Populator {
         implode(' AND ', $where_query)
       ));
     }
+
+    return true;
   }
 
   /*
@@ -401,7 +403,7 @@ class Populator {
 
     // perform once for versions below 3.0.0-beta.36.2.1
     if(version_compare(get_option('mailpoet_db_version'), '3.0.0-beta.36.2.1', '>=')) {
-      return;
+      return false;
     }
 
     $column_list = array(
@@ -439,6 +441,8 @@ class Populator {
       MP_SENDING_QUEUES_TABLE,
       '`type` IN("' . join('" , "', $task_types) . '")'
     ));
+
+    return true;
   }
 
   /*
@@ -452,7 +456,7 @@ class Populator {
 
     // perform once for versions below 3.0.0-beta.36.2.1
     if(version_compare(get_option('mailpoet_db_version'), '3.0.0-beta.36.2.1', '>=')) {
-      return;
+      return false;
     }
 
     $query = "UPDATE `%s` newsletters JOIN `%s` queues ON newsletters.id = queues.newsletter_id SET newsletters.sent_at = queues.processed_at";
@@ -461,5 +465,7 @@ class Populator {
       Newsletter::$_table,
       SendingQueue::$_table
     ));
+
+    return true;
   }
 }
diff --git a/tests/unit/Config/PopulatorTest.php b/tests/unit/Config/PopulatorTest.php
index e41101b96d..772ec748f1 100644
--- a/tests/unit/Config/PopulatorTest.php
+++ b/tests/unit/Config/PopulatorTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MailPoet\Config\Env;
 use MailPoet\Config\Populator;
 use MailPoet\Models\Newsletter;
 use MailPoet\Models\SendingQueue;
@@ -7,6 +8,9 @@ use MailPoet\Models\SendingQueue;
 class PopulatorTest extends MailPoetTest {
   function testItPopulatesNewslettersTableSentAtColumn() {
     // TODO: remove in final release
+
+    // run for versions <= 3.0.0-beta.36.2.0
+    update_option('mailpoet_db_version', '3.0.0-beta.36.2.0');
     $newsletters = array();
     for($i = 1; $i <= 3; $i++) {
       $newsletters[$i] = Newsletter::create();
@@ -21,13 +25,19 @@ class PopulatorTest extends MailPoetTest {
     $sending_queue->save();
 
     $populator = new Populator();
-    $populator->populateNewsletterSentAtField();
+    expect($populator->populateNewsletterSentAtField())->true();
     expect(Newsletter::whereNull('sent_at')->findMany())->count(2);
     expect(Newsletter::whereNotNull('sent_at')->findMany())->count(1);
+
+    // do not run for versions >= 3.0.0-beta.36.2.1
+    update_option('mailpoet_db_version', '3.0.0-beta.36.2.1');
+    $populator = new Populator();
+    expect($populator->populateNewsletterSentAtField())->false();
   }
 
   function _after() {
     ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
     ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
+    update_option('mailpoet_db_version', Env::$version);
   }
 }
\ No newline at end of file