From afc8671eac0181fe0b2628f380e4510fc76d54fb Mon Sep 17 00:00:00 2001
From: Nyholm <tobias.nyholm@gmail.com>
Date: Sun, 5 Aug 2018 10:34:38 +0200
Subject: [PATCH] We need both getApiMock and getApiInstance

---
 tests/Api/EventTest.php |  2 +-
 tests/Api/TestCase.php  | 57 +++++++++++++++++++++++++++++++----------
 2 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/tests/Api/EventTest.php b/tests/Api/EventTest.php
index f16bd0f..c728c57 100644
--- a/tests/Api/EventTest.php
+++ b/tests/Api/EventTest.php
@@ -72,7 +72,7 @@ class EventTest extends TestCase
 JSON
 ));
 
-        $api = $this->getApiMock();
+        $api = $this->getApiInstance();
         $event = $api->get('example.com');
         $this->assertInstanceOf(EventResponse::class, $event);
         $this->assertCount(1, $event->getItems());
diff --git a/tests/Api/TestCase.php b/tests/Api/TestCase.php
index 4cbe766..bee480c 100644
--- a/tests/Api/TestCase.php
+++ b/tests/Api/TestCase.php
@@ -66,6 +66,9 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase
 
     abstract protected function getApiClass();
 
+    /**
+     * This will give you a mocked API. Optionally you can provide mocked dependencies.
+     */
     protected function getApiMock($httpClient = null, $requestClient = null, $hydrator = null)
     {
         if (null === $httpClient) {
@@ -73,26 +76,54 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase
                 ->setMethods(['sendRequest'])
                 ->getMock();
             $httpClient
-                ->method('sendRequest')
-                ->willReturn(null === $this->httpResponse ? new Response() : $this->httpResponse);
+                ->expects($this->any())
+                ->method('sendRequest');
         }
-
         if (null === $requestClient) {
             $requestClient = $this->getMockBuilder('Mailgun\RequestBuilder')
                 ->setMethods(['create'])
                 ->getMock();
-            $requestClient->method('create')
-                ->with(
-                    $this->callback([$this, 'validateRequestMethod']),
-                    $this->callback([$this, 'validateRequestUri']),
-                    $this->callback([$this, 'validateRequestHeaders']),
-                    $this->callback([$this, 'validateRequestBody'])
-                )
-                ->willReturn(new Request('GET', '/'));
         }
+        if (null === $hydrator) {
+            $hydrator = $this->getMockBuilder('Mailgun\Hydrator\Hydrator')
+                ->setMethods(['hydrate'])
+                ->getMock();
+        }
+        return $this->getMockBuilder($this->getApiClass())
+            ->setMethods(['httpGet', 'httpPost', 'httpPostRaw', 'httpDelete', 'httpPut'])
+            ->setConstructorArgs([$httpClient, $requestClient, $hydrator])
+            ->getMock();
+    }
+
+    /**
+     * This will return you a real API instance with mocked dependencies.
+     * This will make use of the "setHydratedResponse" and "setRequestMethod" etc..
+     */
+    protected function getApiInstance()
+    {
+
+        $httpClient = $this->getMockBuilder('Http\Client\HttpClient')
+            ->setMethods(['sendRequest'])
+            ->getMock();
+        $httpClient
+            ->method('sendRequest')
+            ->willReturn(null === $this->httpResponse ? new Response() : $this->httpResponse);
+
+        $requestClient = $this->getMockBuilder('Mailgun\RequestBuilder')
+            ->setMethods(['create'])
+            ->getMock();
+        $requestClient->method('create')
+            ->with(
+                $this->callback([$this, 'validateRequestMethod']),
+                $this->callback([$this, 'validateRequestUri']),
+                $this->callback([$this, 'validateRequestHeaders']),
+                $this->callback([$this, 'validateRequestBody'])
+            )
+            ->willReturn(new Request('GET', '/'));
+
 
         $hydrator = new ModelHydrator();
-        if (null === $hydrator && null === $this->httpResponse) {
+        if (null === $this->httpResponse) {
             $hydrator = $this->getMockBuilder('Mailgun\Hydrator\Hydrator')
                 ->setMethods(['hydrate'])
                 ->getMock();
@@ -227,7 +258,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase
             return true;
         }
 
-        return is_callable($property) ? ($property)($value) : $value === $property;
+        return is_callable($property) ? call_user_func($property, $value) : $value === $property;
     }
 
     /**