fix error with queue order (#6)

verdet23 · Aug 15, 2022 · 33b5779 · 33b5779
1 parent 3721113
commit 33b5779
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 4 deletions.
diff --git a/src/Handler/MockHandler.php b/src/Handler/MockHandler.php
@@ -191,7 +191,7 @@ public function reset(): void
 
     private function getSuitableResponse(RequestInterface $request): mixed
     {
-        foreach (array_reverse($this->queue) as $key => $fixture) {
+        foreach ($this->queue as $key => $fixture) {
             $queueRequest = $fixture[0];
             if (
                 !$this->isSuitableMethod($queueRequest, $request)

diff --git a/tests/Unit/Exception/GuzzleMockExceptionTest.php b/tests/Unit/Exception/GuzzleMockExceptionTest.php
@@ -6,7 +6,6 @@
 
 use GuzzleHttp\Psr7\Request;
 use PHPUnit\Framework\TestCase;
-use RuntimeException;
 use Verdet\GuzzleMock\Exception\GuzzleMockException;
 
 class GuzzleMockExceptionTest extends TestCase
@@ -20,7 +19,7 @@ public function testSuitableResponseNotFound(): void
                 'Accept-Encoding' => 'gzip',
                 'Content-Type' => 'application/json',
             ],
-            json_encode(['foo' => 'bar', 'query' => 8472]) ?: throw new RuntimeException()
+            json_encode(['foo' => 'bar', 'query' => 8472], JSON_THROW_ON_ERROR)
         );
 
         $exception = GuzzleMockException::suitableResponseNotFound($request);

diff --git a/tests/Unit/Handler/MockHandlerTest.php b/tests/Unit/Handler/MockHandlerTest.php
@@ -81,7 +81,7 @@ public function testCanGetLastRequestAndOptions(): void
 
     public function testSinkFilename(): void
     {
-        $filename = \sys_get_temp_dir() . '/mock_test_' . \uniqid();
+        $filename = \sys_get_temp_dir() . '/mock_test_' . \uniqid('', true);
         $response = new Response(200, [], 'TEST CONTENT');
         $request = new Request('GET', '/');
 
@@ -341,4 +341,50 @@ public function testFindSuitableByContentType(): void
 
         $this->assertSame($responseJson, $result);
     }
+
+    public function testObtainCoupleResult(): void
+    {
+        $requestXML = new Request(
+            'GET',
+            'https://example.com/page',
+            ['Accept-Charset' => 'utf-8', 'Accept' => 'application/xml']
+        );
+        $responseXML = new Response(
+            200,
+            ['Accept' => 'application/xml'],
+            '<?xml version="1.0" encoding="UTF-8"?>'
+        );
+
+        $requestJson = new Request('GET', 'https://example.com/page', ['Accept' => 'application/json']);
+        $responseJson = new Response(
+            200,
+            ['Content-Type' => 'application/json'],
+            '{}'
+        );
+
+        $requestHTML = new Request('GET', 'https://example.com/page', ['Accept' => 'text/html']);
+        $responseHTML = new Response(
+            200,
+            ['Content-Type' => 'text/htnl'],
+            '<html></html>'
+        );
+
+        $mock = new MockHandler(
+            [
+                [$requestJson, $responseJson],
+                [$requestXML, $responseXML],
+                [$requestHTML, $responseHTML]
+            ]
+        );
+
+
+        $result = $mock($requestHTML, [])->wait();
+        $this->assertSame($responseHTML, $result);
+
+        $result = $mock($requestXML, [])->wait();
+        $this->assertSame($responseXML, $result);
+
+        $result = $mock($requestJson, [])->wait();
+        $this->assertSame($responseJson, $result);
+    }
 }