unit tests and cleanup

lib/Config/Menu.php

@@ -4,9 +4,9 @@ use \MailPoet\Models\Segment;
 use \MailPoet\Models\Setting;
 use \MailPoet\Settings\Hosts;
 use \MailPoet\Settings\Pages;
+use \MailPoet\Settings\Charsets;
 use \MailPoet\Util\Permissions;
 use \MailPoet\Util\DKIM;
-use \MailPoet\Util\Charsets;
 
 if(!defined('ABSPATH')) exit;
 

lib/Settings/Charsets.php

@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\Util;
+namespace MailPoet\Settings;
 
 class Charsets {
   static function getAll() {

lib/Settings/Pages.php

@@ -8,14 +8,14 @@ class Pages {
       'post_type' => 'mailpoet_page'
     ));
 
-    $pages = array_merge($mailpoet_pages, get_pages());
+    $pages = array();
-
+    foreach(array_merge($mailpoet_pages, get_pages()) as $page) {
-    foreach($pages as $key => $page) {
+      $pages[] = array(
-      $page = (array)$page;
+        'id' => $page->ID,
-      $page['preview_url'] = get_permalink($page['ID']);
+        'title' => $page->post_title,
-      $page['edit_url'] = get_edit_post_link($page['ID']);
+        'preview_url' => get_permalink($page->ID),
-
+        'edit_url' => get_edit_post_link($page->ID)
-      $pages[$key] = $page;
+      );
     }
 
     return $pages;

tests/unit/Models/NewsletterCest.php

@@ -76,7 +76,8 @@ class NewsletterCest {
         'subject' => 'new newsletter',
         'body' => 'body'
       ));
-    expect($is_created)->equals(true);
+    expect($is_created)->notEquals(false);
+    expect($is_created)->greaterThan(0);
 
     $newsletter = Newsletter::where('subject', 'new newsletter')
       ->findOne();

tests/unit/Settings/CharsetsCest.php

@@ -0,0 +1,10 @@
+<?php
+use \MailPoet\Settings\Charsets;
+
+class CharsetsCest {
+  function itReturnsAListOfCharsets() {
+    $charsets = Charsets::getAll();
+    expect($charsets)->notEmpty();
+    expect($charsets[0])->equals('UTF-8');
+  }
+}

tests/unit/Settings/HostsCest.php

@@ -0,0 +1,24 @@
+<?php
+use \MailPoet\Settings\Hosts;
+
+class HostsCest {
+  function itReturnsAListOfWebHosts() {
+    $web_hosts = Hosts::getWebHosts();
+    expect($web_hosts)->notEmpty();
+
+    foreach($web_hosts as $host) {
+      expect($host['interval'])->greaterThan(0);
+      expect($host['emails'])->greaterThan(0);
+    }
+  }
+
+  function itReturnsAListOfSMTPHosts() {
+    $smtp_hosts = Hosts::getSMTPHosts();
+    expect($smtp_hosts)->notEmpty();
+
+    foreach($smtp_hosts as $host) {
+      expect($host['interval'])->greaterThan(0);
+      expect($host['emails'])->greaterThan(0);
+    }
+  }
+}

tests/unit/Settings/PagesCest.php

@@ -0,0 +1,15 @@
+<?php
+use \MailPoet\Settings\Pages;
+
+class PagesCest {
+  function itReturnsAListOfPages() {
+    $pages = Pages::getAll();
+    expect($pages)->notEmpty();
+
+    foreach($pages as $page) {
+      expect($page['id'])->greaterThan(0);
+      expect($page['title'])->notEmpty();
+      expect($page['preview_url'])->notEmpty();
+    }
+  }
+}

views/settings/basics.html

@@ -217,13 +217,13 @@
           >
             <% for page in pages %>
               <option
-                value="<%= page.ID %>"
+                value="<%= page.id %>"
                 data-preview-url="<%= page.preview_url|raw %>"
                 data-edit-url="<%= page.edit_url|raw %>"
-                <% if(page.ID == settings.subscription.page) %>
+                <% if(page.id == settings.subscription.page) %>
                   selected="selected"
                 <% endif %>
-              ><%= page.post_title %></option>
+              ><%= page.title %></option>
             <% endfor %>
           </select>
           <a

views/settings/signup.html

@@ -162,13 +162,13 @@
           >
             <% for page in pages %>
               <option
-                value="<%= page.ID %>"
+                value="<%= page.id %>"
                 data-preview-url="<%= page.preview_url|raw %>"
                 data-edit-url="<%= page.edit_url|raw %>"
-                <% if(page.ID == settings.signup_confirmation.page) %>
+                <% if(page.id == settings.signup_confirmation.page) %>
                   selected="selected"
                 <% endif %>
-              ><%= page.post_title %></option>
+              ><%= page.title %></option>
             <% endfor %>
           </select>
           <a