test(client): Add tests on queries from the client

remi-san · Jul 13, 2017 · 85b3a79 · 85b3a79
1 parent 46628bd
commit 85b3a79
Show file tree

Hide file tree

Showing 4 changed files with 283 additions and 28 deletions.
diff --git a/src/API/REST/Client/TwitterApiClient.php b/src/API/REST/Client/TwitterApiClient.php
@@ -127,7 +127,7 @@ public function getMentionsTweets($from = null, $to = null)
         if (!empty($tweets) && $from !== null) {
             $moreTweets = $this->getMentionsTweets($from, min(array_keys($tweets))-1);
             if (!empty($moreTweets)) {
-                $tweets = $tweets + $moreTweets;
+                $tweets += $moreTweets;
             }
         }
         ksort($tweets);
@@ -164,7 +164,7 @@ public function getDirectMessages($from = null, $to = null)
         if (!empty($dms) && $from !== null) {
             $moreDms = $this->getDirectMessages($from, min(array_keys($dms))-1);
             if (!empty($moreDms)) {
-                $dms = $dms + $moreDms;
+                $dms += $moreDms;
             }
         }
         ksort($dms);
@@ -372,6 +372,15 @@ public function unfollow(TwitterUser $user)
         $this->handleResponse(self::UNFOLLOW, $response);
     }
 
+    /**
+     * @param string  $category
+     * @param ApiRate $rate
+     */
+    public function setRateLimit($category, ApiRate $rate)
+    {
+        $this->rateLimits[$category] = $rate;
+    }
+
     /**
      * @param string $category
      *
@@ -395,6 +404,6 @@ private function checkRate($category)
      */
     private function handleResponse($category, ApiResponse $response)
     {
-        $this->rateLimits[$category] = $response->getRate();
+        $this->setRateLimit($category, $response->getRate());
     }
 }
diff --git a/src/API/REST/Response/LimitedApiRate.php b/src/API/REST/Response/LimitedApiRate.php
@@ -47,7 +47,8 @@ public function getLimit()
      */
     public function canMakeAnotherCall()
     {
-        return $this->remaining > 0;
+        return $this->reset <= new \DateTimeImmutable('now', new \DateTimeZone('UTC'))
+            || $this->remaining > 0;
     }
 
     /**