Add mocked handler for testing

Author: odan

src/Factory/NovaHttpClientFactory.php

@@ -2,11 +2,14 @@
 
 namespace OrcaServices\NovaApi\Factory;
 
+use GuzzleHttp\Handler\MockHandler;
+use GuzzleHttp\HandlerStack;
 use InvalidArgumentException;
 use OrcaServices\NovaApi\Client\NovaHttpClient;
 use OrcaServices\NovaApi\Configuration\NovaApiConfiguration;
 use OrcaServices\NovaApi\Method\NovaLoginMethod;
 use OrcaServices\NovaApi\Parser\NovaApiErrorParser;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Factory.
@@ -23,6 +26,16 @@ final class NovaHttpClientFactory
      */
     private $novaErrorParser;
 
+    /**
+     * @var array
+     */
+    private $mockedResponses = [];
+
+    /**
+     * @var HandlerStack|null
+     */
+    private $handler;
+
     /**
      * The constructor.
      *
@@ -79,10 +92,25 @@ public function createLoggedInHttpClient(): NovaHttpClient
      */
     private function createHttpClient(array $settings): NovaHttpClient
     {
-        if (empty($settings['base_uri'])) {
-            throw new InvalidArgumentException('The NOVA API base URI is not defined');
+        if ($this->mockedResponses || empty($settings['base_uri']) || $settings['base_uri'] === 'http://localhost/') {
+            // Use the same mocked handler stack for login and the endpoint client for testing
+            $this->handler = $this->handler ?: HandlerStack::create(new MockHandler($this->mockedResponses));
+            $settings['base_uri'] = 'http://localhost';
+            $settings['handler'] = $this->handler;
         }
 
         return new NovaHttpClient($settings);
     }
+
+    /**
+     * Set mocked responses.
+     *
+     * @param ResponseInterface[] $responses The responses
+     *
+     * @return void
+     */
+    public function setMockedResponses(array $responses)
+    {
+        $this->mockedResponses = $responses;
+    }
 }

tests/Traits/NovaClientTestTrait.php

@@ -3,11 +3,10 @@
 namespace OrcaServices\NovaApi\Test\Traits;
 
 use Cake\Chronos\Chronos;
-use GuzzleHttp\Handler\MockHandler;
-use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 use OrcaServices\NovaApi\Client\NovaApiClient;
 use OrcaServices\NovaApi\Configuration\NovaApiConfiguration;
+use OrcaServices\NovaApi\Factory\NovaHttpClientFactory;
 use OrcaServices\NovaApi\Parameter\NovaIdentifierParameter;
 
 /**
@@ -27,24 +26,22 @@ protected function createNovaApiClient(array $responses): NovaApiClient
         Chronos::setTestNow('2019-09-01 00:00:00');
 
         $settings = $this->getSettings();
+        $this->getContainer()->set(NovaApiConfiguration::class, new NovaApiConfiguration($settings));
 
         // To make real http calls, just comment out this line
-        $settings = $this->mockNovaGuzzleClient($settings, $responses);
-
-        $this->getContainer()->set(NovaApiConfiguration::class, new NovaApiConfiguration($settings));
+        $this->mockNovaGuzzleClient($responses);
 
         return $this->getContainer()->get(NovaApiClient::class);
     }
 
     /**
      * Mock NOVA Guzzle client and single sign on (SSO).
      *
-     * @param array $settings The nova api settings
      * @param array $responses The mocked responses
      *
-     * @return array
+     * @return void
      */
-    protected function mockNovaGuzzleClient(array $settings, array $responses): array
+    protected function mockNovaGuzzleClient(array $responses)
     {
         // Append the login as first response
         $loginResponse = new Response();
@@ -54,9 +51,7 @@ protected function mockNovaGuzzleClient(array $settings, array $responses): arra
 
         array_unshift($responses, $loginResponse);
 
-        $settings['default']['handler'] = HandlerStack::create(new MockHandler($responses));
-
-        return $settings;
+        $this->getContainer()->get(NovaHttpClientFactory::class)->setMockedResponses($responses);
     }
 
     /**