From c96ac064233b821d7205809ee9b82c710e1165fe Mon Sep 17 00:00:00 2001
From: MrCasual <site.github@mrcasual.com>
Date: Fri, 13 Nov 2015 12:33:34 -0500
Subject: [PATCH] - Moves ImportExport under Subscribers namespace - Updates
 tests

---
 lib/Config/Menu.php                           |  2 +-
 lib/Router/ImportExport.php                   |  6 ++--
 .../ImportExport/BootstrapMenu.php            |  2 +-
 .../ImportExport/Export/Export.php            |  4 +--
 .../ImportExport/Import/Import.php            |  4 +--
 .../ImportExport/Import/MailChimp.php         |  2 +-
 .../ImportExport/BootStrapMenuCest.php        |  2 +-
 .../ImportExport/Export/ExportCest.php        |  2 +-
 .../ImportExport/Import/ImportCest.php        | 28 +++++++++----------
 .../ImportExport/Import/ImportTestData.json   |  0
 .../ImportExport/Import/MailChimpCest.php     |  2 +-
 webpack.config.js                             |  4 +--
 12 files changed, 29 insertions(+), 29 deletions(-)
 rename lib/{ => Subscribers}/ImportExport/BootstrapMenu.php (98%)
 rename lib/{ => Subscribers}/ImportExport/Export/Export.php (97%)
 rename lib/{ => Subscribers}/ImportExport/Import/Import.php (98%)
 rename lib/{ => Subscribers}/ImportExport/Import/MailChimp.php (98%)
 rename tests/unit/{ => Subscribers}/ImportExport/BootStrapMenuCest.php (99%)
 rename tests/unit/{ => Subscribers}/ImportExport/Export/ExportCest.php (88%)
 rename tests/unit/{ => Subscribers}/ImportExport/Import/ImportCest.php (95%)
 rename tests/unit/{ => Subscribers}/ImportExport/Import/ImportTestData.json (100%)
 rename tests/unit/{ => Subscribers}/ImportExport/Import/MailChimpCest.php (97%)

diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php
index a1c6dff1a9..a88ba27775 100644
--- a/lib/Config/Menu.php
+++ b/lib/Config/Menu.php
@@ -1,7 +1,7 @@
 <?php
 namespace MailPoet\Config;
 
-use MailPoet\ImportExport\BootStrapMenu;
+use MailPoet\Subscribers\ImportExport\BootStrapMenu;
 use \MailPoet\Models\Segment;
 use \MailPoet\Models\Setting;
 use \MailPoet\Models\Form;
diff --git a/lib/Router/ImportExport.php b/lib/Router/ImportExport.php
index 50a994b354..c8d3881014 100644
--- a/lib/Router/ImportExport.php
+++ b/lib/Router/ImportExport.php
@@ -1,7 +1,7 @@
 <?php
 namespace MailPoet\Router;
 
-use MailPoet\ImportExport\Import\MailChimp;
+use MailPoet\Subscribers\ImportExport\Import\MailChimp;
 use MailPoet\Models\CustomField;
 use MailPoet\Models\Segment;
 
@@ -49,12 +49,12 @@ class ImportExport {
   }
 
   function processImport($data) {
-    $import = new \MailPoet\ImportExport\Import\Import(json_decode($data, true));
+    $import = new \MailPoet\Subscribers\ImportExport\Import\Import(json_decode($data, true));
     wp_send_json($import->process());
   }
 
   function processExport($data) {
-    $export = new \MailPoet\ImportExport\Export\Export(json_decode($data, true));
+    $export = new \MailPoet\Subscribers\ImportExport\Export\Export(json_decode($data, true));
     wp_send_json($export->process());
   }
 }
\ No newline at end of file
diff --git a/lib/ImportExport/BootstrapMenu.php b/lib/Subscribers/ImportExport/BootstrapMenu.php
similarity index 98%
rename from lib/ImportExport/BootstrapMenu.php
rename to lib/Subscribers/ImportExport/BootstrapMenu.php
index 259aba3340..96bc57a0bb 100644
--- a/lib/ImportExport/BootstrapMenu.php
+++ b/lib/Subscribers/ImportExport/BootstrapMenu.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\ImportExport;
+namespace MailPoet\Subscribers\ImportExport;
 
 use MailPoet\Models\CustomField;
 use MailPoet\Models\Segment;
diff --git a/lib/ImportExport/Export/Export.php b/lib/Subscribers/ImportExport/Export/Export.php
similarity index 97%
rename from lib/ImportExport/Export/Export.php
rename to lib/Subscribers/ImportExport/Export/Export.php
index 9be9dc00fd..00523a9e92 100644
--- a/lib/ImportExport/Export/Export.php
+++ b/lib/Subscribers/ImportExport/Export/Export.php
@@ -1,8 +1,8 @@
 <?php
-namespace MailPoet\ImportExport\Export;
+namespace MailPoet\Subscribers\ImportExport\Export;
 
 use MailPoet\Config\Env;
-use MailPoet\ImportExport\BootStrapMenu;
+use MailPoet\Subscribers\ImportExport\BootStrapMenu;
 use MailPoet\Models\Segment;
 use MailPoet\Models\Subscriber;
 use MailPoet\Models\SubscriberSegment;
diff --git a/lib/ImportExport/Import/Import.php b/lib/Subscribers/ImportExport/Import/Import.php
similarity index 98%
rename from lib/ImportExport/Import/Import.php
rename to lib/Subscribers/ImportExport/Import/Import.php
index a4bdac06df..273389bf06 100644
--- a/lib/ImportExport/Import/Import.php
+++ b/lib/Subscribers/ImportExport/Import/Import.php
@@ -1,7 +1,7 @@
 <?php
-namespace MailPoet\ImportExport\Import;
+namespace MailPoet\Subscribers\ImportExport\Import;
 
-use MailPoet\ImportExport\BootStrapMenu;
+use MailPoet\Subscribers\ImportExport\BootStrapMenu;
 use MailPoet\Models\Subscriber;
 use MailPoet\Models\SubscriberCustomField;
 use MailPoet\Models\SubscriberSegment;
diff --git a/lib/ImportExport/Import/MailChimp.php b/lib/Subscribers/ImportExport/Import/MailChimp.php
similarity index 98%
rename from lib/ImportExport/Import/MailChimp.php
rename to lib/Subscribers/ImportExport/Import/MailChimp.php
index 85ae46b977..8267bddc44 100644
--- a/lib/ImportExport/Import/MailChimp.php
+++ b/lib/Subscribers/ImportExport/Import/MailChimp.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\ImportExport\Import;
+namespace MailPoet\Subscribers\ImportExport\Import;
 
 use MailPoet\Util\Helpers;
 
diff --git a/tests/unit/ImportExport/BootStrapMenuCest.php b/tests/unit/Subscribers/ImportExport/BootStrapMenuCest.php
similarity index 99%
rename from tests/unit/ImportExport/BootStrapMenuCest.php
rename to tests/unit/Subscribers/ImportExport/BootStrapMenuCest.php
index 8defaa30c8..f43a2d9927 100644
--- a/tests/unit/ImportExport/BootStrapMenuCest.php
+++ b/tests/unit/Subscribers/ImportExport/BootStrapMenuCest.php
@@ -1,6 +1,6 @@
 <?php
 
-use MailPoet\ImportExport\BootStrapMenu;
+use MailPoet\Subscribers\ImportExport\BootStrapMenu;
 use MailPoet\Models\CustomField;
 use MailPoet\Models\Segment;
 use MailPoet\Models\Subscriber;
diff --git a/tests/unit/ImportExport/Export/ExportCest.php b/tests/unit/Subscribers/ImportExport/Export/ExportCest.php
similarity index 88%
rename from tests/unit/ImportExport/Export/ExportCest.php
rename to tests/unit/Subscribers/ImportExport/Export/ExportCest.php
index d6f1d4968f..93f6ad0173 100644
--- a/tests/unit/ImportExport/Export/ExportCest.php
+++ b/tests/unit/Subscribers/ImportExport/Export/ExportCest.php
@@ -1,6 +1,6 @@
 <?php
 
-use MailPoet\ImportExport\Export;
+use MailPoet\Subscribers\ImportExport\Export;
 
 class ExportCest {
   function __construct() {
diff --git a/tests/unit/ImportExport/Import/ImportCest.php b/tests/unit/Subscribers/ImportExport/Import/ImportCest.php
similarity index 95%
rename from tests/unit/ImportExport/Import/ImportCest.php
rename to tests/unit/Subscribers/ImportExport/Import/ImportCest.php
index b9f4769f47..fec7f15fc9 100644
--- a/tests/unit/ImportExport/Import/ImportCest.php
+++ b/tests/unit/Subscribers/ImportExport/Import/ImportCest.php
@@ -1,6 +1,6 @@
 <?php
 
-use MailPoet\ImportExport\Import\Import;
+use MailPoet\Subscribers\ImportExport\Import\Import;
 use MailPoet\Models\Subscriber;
 use MailPoet\Models\SubscriberCustomField;
 use MailPoet\Models\SubscriberSegment;
@@ -127,19 +127,19 @@ class ImportCest {
     expect($statuses)->equals(
       array(
         'status' => array(
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          -1,
-          -1,
-          -1,
-          -1,
-          1,
-          1
+          'confirmed',
+          'confirmed',
+          'confirmed',
+          'confirmed',
+          'confirmed',
+          'confirmed',
+          'confirmed',
+          'unsubscribed',
+          'unsubscribed',
+          'unsubscribed',
+          'unsubscribed',
+          'confirmed',
+          'confirmed'
         )
       )
     );
diff --git a/tests/unit/ImportExport/Import/ImportTestData.json b/tests/unit/Subscribers/ImportExport/Import/ImportTestData.json
similarity index 100%
rename from tests/unit/ImportExport/Import/ImportTestData.json
rename to tests/unit/Subscribers/ImportExport/Import/ImportTestData.json
diff --git a/tests/unit/ImportExport/Import/MailChimpCest.php b/tests/unit/Subscribers/ImportExport/Import/MailChimpCest.php
similarity index 97%
rename from tests/unit/ImportExport/Import/MailChimpCest.php
rename to tests/unit/Subscribers/ImportExport/Import/MailChimpCest.php
index 43d167c226..5629064ea7 100644
--- a/tests/unit/ImportExport/Import/MailChimpCest.php
+++ b/tests/unit/Subscribers/ImportExport/Import/MailChimpCest.php
@@ -1,6 +1,6 @@
 <?php
 
-use MailPoet\ImportExport\Import\MailChimp;
+use MailPoet\Subscribers\ImportExport\Import\MailChimp;
 
 class MailChimpCest {
   function __construct() {
diff --git a/webpack.config.js b/webpack.config.js
index bcb1647286..06142df513 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -29,7 +29,7 @@ baseConfig = {
       'blob$': 'blob/Blob.js',
       'filesaver$': 'filesaver/FileSaver.js',
       'papaparse': 'papaparse/papaparse.min.js',
-      'helpscout': 'helpscout.js',
+      'helpscout': 'helpscout.js'
     },
   },
   node: {
@@ -96,7 +96,7 @@ config.push(_.extend({}, baseConfig, {
       'forms/forms.jsx',
       'settings/tabs.js',
       'import/import.js',
-      'export/export.js'      
+      'export/export.js',
       'helpscout'
     ],
     form_editor: [