Merge pull request #137 from Sammyjo20/feature/v2-mock-exceptions

Feature | V2 - Added back throwing mock exceptions

Author: Sammyjo20

src/Http/Faking/SimulatedResponsePayload.php

@@ -158,7 +158,7 @@ public function throwsException(): bool
      */
     public function getException(PendingRequest $pendingRequest): ?Throwable
     {
-        if (is_null($this->responseException)) {
+        if (! $this->throwsException()) {
             return null;
         }
 

src/Http/Senders/SimulatedSender.php

@@ -21,10 +21,11 @@ class SimulatedSender implements Sender
     /**
      * Send the request.
      *
-     * @param PendingRequest $pendingRequest
+     * @param \Saloon\Contracts\PendingRequest $pendingRequest
      * @param bool $asynchronous
-     * @return Response|PromiseInterface
+     * @return \Saloon\Contracts\Response|\GuzzleHttp\Promise\PromiseInterface
      * @throws \Saloon\Exceptions\SenderException
+     * @throws \Throwable
      */
     public function sendRequest(PendingRequest $pendingRequest, bool $asynchronous = false): ResponseContract|PromiseInterface
     {
@@ -34,10 +35,17 @@ public function sendRequest(PendingRequest $pendingRequest, bool $asynchronous =
             throw new SenderException('Simulated response payload must be present on the pending request instance');
         }
 
-        // Let's create our response!
+        // Check if the SimulatedResponsePayload throws an exception. If the request is
+        // asynchronous, then we should allow the promise handler to deal with the exception.
 
         $exception = $simulatedResponsePayload->getException($pendingRequest);
 
+        if ($exception instanceof Throwable && $asynchronous === false) {
+            throw $exception;
+        }
+
+        // Let's create our response!
+
         /** @var class-string<\Saloon\Contracts\Response> $responseClass */
         $responseClass = $pendingRequest->getResponseClass();
 

tests/Feature/GuzzleMiddlewareTest.php

@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use GuzzleHttp\Utils;
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Uri;
 use GuzzleHttp\HandlerStack;
@@ -96,3 +97,14 @@
 
     expect($freshClient->getConfig())->toEqual($client->getConfig());
 });
+
+test('you can set a custom handler stack on the guzzle sender', function () {
+    $connector = new TestConnector;
+    $sender = $connector->sender();
+
+    $handlerStack = new HandlerStack(Utils::chooseHandler());
+
+    $sender->setHandlerStack($handlerStack);
+
+    expect($sender->getHandlerStack())->toBe($handlerStack);
+});

tests/Feature/GuzzleSenderTest.php

@@ -247,7 +247,7 @@
 
     $response = connector()->send(new UserRequest, $mockClient);
     $response->throw();
-})->skip();
+});
 
 test('you can mock normal exceptions', function () {
     $mockClient = new MockClient([
@@ -259,4 +259,4 @@
 
     $response = connector()->send(new UserRequest, $mockClient);
     $response->throw();
-})->skip();
+});

tests/Unit/MockClientTest.php

@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Psr7\Response;
 use Saloon\Http\PendingRequest;
+use Saloon\Contracts\ArrayStore;
 use Illuminate\Support\Collection;
 use Saloon\Http\Faking\MockClient;
 use Saloon\Http\Faking\MockResponse;
@@ -203,17 +204,27 @@
 
 test('the headers method returns an array store', function () {
     $mockClient = new MockClient([
-        MockResponse::make(['name' => 'Sam', 'work' => 'Codepotato'], ['X-Greeting' => 'Howdy']),
+        MockResponse::make(['name' => 'Sam', 'work' => 'Codepotato'], 200, ['X-Greeting' => 'Howdy']),
     ]);
 
     $response = connector()->send(new UserRequest, $mockClient);
 
-    dd($response->headers());
-})->skip('SAM TODO');
+    expect($response->headers())->toBeInstanceOf(ArrayStore::class);
+});
 
 test('headers with a single value will have just the string value but headers with multiple values will be an array', function () {
-    //
-})->skip('SAM TODO');
+    $mockClient = new MockClient([
+        MockResponse::make(['name' => 'Sam', 'work' => 'Codepotato'], 200, ['X-Greeting' => 'Howdy', 'X-Farewell' => ['Goodbye', 'Sam']]),
+    ]);
+
+    $response = connector()->send(new UserRequest, $mockClient);
+
+    expect($response->headers()->get('X-Greeting'))->toEqual('Howdy');
+    expect($response->headers()->get('X-Farewell'))->toEqual(['Goodbye', 'Sam']);
+
+    expect($response->header('X-Greeting'))->toEqual('Howdy');
+    expect($response->header('X-Farewell'))->toEqual(['Goodbye', 'Sam']);
+});
 
 test('the dom method will return a crawler instance', function () {
     $dom = '<p>Howdy <i>Partner</i></p>';