More coverage

Author: Sammyjo20

src/Clients/BaseMockClient.php

@@ -331,7 +331,7 @@ protected function checkRequestWasSent(string|callable $request): bool
             if (class_exists($request) && ReflectionHelper::isSubclassOf($request, SaloonRequest::class)) {
                 $result = $this->findResponseByRequest($request) instanceof SaloonResponse;
             } else {
-                $result = $this->findResponseWithRequestUrl($request) instanceof SaloonResponse;
+                $result = $this->findResponseByRequestUrl($request) instanceof SaloonResponse;
             }
         }
 
@@ -357,7 +357,7 @@ protected function checkRequestWasNotSent(string|callable $request): bool
      * @param string $request
      * @return SaloonResponse|null
      */
-    protected function findResponseByRequest(string $request): ?SaloonResponse
+    public function findResponseByRequest(string $request): ?SaloonResponse
     {
         $lastRequest = $this->getLastRequest();
 
@@ -381,7 +381,7 @@ protected function findResponseByRequest(string $request): ?SaloonResponse
      * @return SaloonResponse|null
      * @throws \Sammyjo20\Saloon\Exceptions\SaloonInvalidConnectorException
      */
-    protected function findResponseWithRequestUrl(string $url): ?SaloonResponse
+    public function findResponseByRequestUrl(string $url): ?SaloonResponse
     {
         $lastRequest = $this->getLastRequest();
 

tests/Unit/MockClientTest.php

@@ -168,3 +168,43 @@
 
     expect($mockClient)->getLastRequest()->toBeNull();
 });
+
+test('if the response is not the last response it will use the loop to find it', function () {
+    $mockClient = new MockClient([
+        new MockResponse(['name' => 'Sam'], 200),
+        new MockResponse(['error' => 'Server Error'], 500),
+    ]);
+
+    $responseA = (new ErrorRequest())->send($mockClient);
+    $responseB = (new UserRequest())->send($mockClient);
+
+    expect($mockClient)->getLastResponse()->toBe($responseB);
+
+    // Uses last response
+
+    expect($mockClient)->findResponseByRequest(UserRequest::class)->toBe($responseB);
+
+    // Does not use the last response
+
+    expect($mockClient)->findResponseByRequest(ErrorRequest::class)->toBe($responseA);
+});
+
+test('it will find the response by url if it is not the last response', function () {
+    $mockClient = new MockClient([
+        '/user' => new MockResponse(['name' => 'Sam'], 200),
+        '/error' => new MockResponse(['error' => 'Server Error'], 500),
+    ]);
+
+    $responseA = (new ErrorRequest())->send($mockClient);
+    $responseB = (new UserRequest())->send($mockClient);
+
+    expect($mockClient)->getLastResponse()->toBe($responseB);
+
+    // Uses last response
+
+    expect($mockClient)->findResponseByRequestUrl('/user')->toBe($responseB);
+
+    // Does not use the last response
+
+    expect($mockClient)->findResponseByRequestUrl('/error')->toBe($responseA);
+});