- Moves ImportExport under Subscribers namespace

- Updates tests

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;

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());
   }
 }

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;

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;

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;

lib/Subscribers/ImportExport/Import/MailChimp.php

@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\ImportExport\Import;
+namespace MailPoet\Subscribers\ImportExport\Import;
 
 use MailPoet\Util\Helpers;
 

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;

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() {

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,
+          'confirmed',
-          1,
+          'confirmed',
-          1,
+          'confirmed',
-          1,
+          'confirmed',
-          1,
+          'confirmed',
-          1,
+          'confirmed',
-          1,
+          'confirmed',
-          -1,
+          'unsubscribed',
-          -1,
+          'unsubscribed',
-          -1,
+          'unsubscribed',
-          -1,
+          'unsubscribed',
-          1,
+          'confirmed',
-          1
+          'confirmed'
         )
       )
     );

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() {

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: [