Merge pull request #2 from messagemedia/fix-tests

Fix tests

Author: JamesDale

tests/Controllers/WebhooksControllerTest.php

@@ -29,8 +29,10 @@ class WebhooksControllerTest extends \PHPUnit_Framework_TestCase
      */
     public static function setUpBeforeClass()
     {
+        TestHelper::getAuthorizationFromEnvironment();
         $client = new \MessageMediaWebhooksLib\MessageMediaWebhooksClient();
         self::$controller = $client->getWebhooks();
+
     }
 
     /**

tests/TestHelper.php

@@ -7,8 +7,10 @@
 
 namespace MessageMediaWebhooksLib\Tests;
 
+
 use MessageMediaWebhooksLib\APIHelper;
 use \apimatic\jsonmapper\JsonMapper;
+use MessageMediaWebhooksLib\Configuration;
 
 /**
  * Configure Test Constants
@@ -58,7 +60,7 @@ public static function isProperSubsetOf(
         $allowExtra,
         $isOrdered
     ) {
-    
+
         if ($leftTree == null) {
             return true;
         }
@@ -123,7 +125,7 @@ public static function isProperSubsetOf(
         }
         return true;
     }
-    
+
     /**
      * Recursively check whether the left JSON object is a proper subset of the right JSON object
      * @param   array   $leftObject     Left JSON object as string
@@ -140,7 +142,7 @@ public static function isJsonObjectProperSubsetOf(
         $allowExtra,
         $isOrdered
     ) {
-    
+
         return static::isProperSubsetOf(
             APIHelper::deserialize($leftObject),
             APIHelper::deserialize($rightObject),
@@ -149,7 +151,7 @@ public static function isJsonObjectProperSubsetOf(
             $isOrdered
         );
     }
-    
+
     /**
      * Check if left array of objects is a subset of right array
      * @param   array   $leftObject     Left array as a JSON string
@@ -166,11 +168,11 @@ public static function isArrayOfStringifiedJsonObjectsProperSubsetOf(
         $allowExtra,
         $isOrdered
     ) {
-    
+
         // Deserialize left and right objects from their respective strings
         $left = APIHelper::deserialize($leftObject);
         $right = APIHelper::deserialize($rightObject);
-        
+
         return static::isArrayOfJsonObjectsProperSubsetOf(
             $left,
             $right,
@@ -196,27 +198,27 @@ public static function isArrayOfJsonObjectsProperSubsetOf(
         $allowExtra,
         $isOrdered
     ) {
-    
+
         // Return false if size different and checking was strict
         if (!$allowExtra && count($left) != count($right)) {
             return false;
         }
-        
+
         // Create list iterators
         $leftIter = (new \ArrayObject($left))->getIterator();
         $rightIter = (new \ArrayObject($right))->getIterator();
-        
+
         // Iterate left list and check if each value is present in the right list
         while ($leftIter->valid()) {
             $leftIter->next();
             $leftTree = $leftIter->current();
             $found = false;
-            
+
             // If order is not required, then search right array from beginning
             if (!$isOrdered) {
                 $rightIter->rewind();
             }
-            
+
             // Check each right element to see if left is a subset
             while ($rightIter->valid()) {
                 $rightIter->next();
@@ -231,15 +233,15 @@ public static function isArrayOfJsonObjectsProperSubsetOf(
                     break;
                 }
             }
-            
+
             if (!$found) {
                 return false;
             }
         }
-        
+
         return true;
     }
-    
+
     /**
      * Check whether the a list is a subset of another list
      * @param   array   $leftList   Expected List
@@ -254,7 +256,7 @@ public static function isListProperSubsetOf(
         $allowExtra,
         $isOrdered
     ) {
-    
+
         if ($isOrdered && !$allowExtra) {
             return $leftList === $rightList;
         } elseif ($isOrdered && $allowExtra) {
@@ -267,7 +269,7 @@ public static function isListProperSubsetOf(
         }
         return true;
     }
-    
+
     /**
      * Recursively check whether the left headers map is a proper subset of
      * the right headers map. Header keys & values are compared case-insensitive.
@@ -282,7 +284,7 @@ public static function areHeadersProperSubsetOf(
         array $rightTree,
         $checkValues
     ) {
-    
+
         // Http headers are case-insensitive
         $l = array_change_key_case($leftTree);
         $r = array_change_key_case($rightTree);
@@ -345,4 +347,10 @@ public static function getJsonMapper()
         return $mapper;
     }
 
+    public static function getAuthorizationFromEnvironment()
+    {
+        Configuration::$basicAuthUserName = getenv('MessageMediaApiTestsKey');
+        Configuration::$basicAuthPassword = getenv('MessageMediaApiTestsSecret');
+    }
+
 }