Merge pull request #688 from tienvx/fix-conflict-pact-file-name

fix(compatibility-suite): Clean up mock server
pact-foundation · Oct 21, 2024 · ef3957e · ef3957e
2 parents 11a6c4a + 4d98388
commit ef3957e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/compatibility-suite/tests/Service/Server.php b/compatibility-suite/tests/Service/Server.php
@@ -77,4 +77,10 @@ public function getPort(): int
     {
         return $this->config->getPort();
     }
+
+    public function __destruct()
+    {
+        // Clean up mock server
+        $this->getVerifyResult();
+    }
 }
diff --git a/src/PhpPact/Consumer/Driver/Pact/PactDriver.php b/src/PhpPact/Consumer/Driver/Pact/PactDriver.php
@@ -23,6 +23,9 @@ public function __construct(
 
     public function cleanUp(): void
     {
+        if (!$this->pact) {
+            return;
+        }
         $success = $this->client->freePactHandle($this->getPact()->handle) === 0;
         if (!$success) {
             trigger_error('Can not free pact handle. The handle is not valid or does not refer to a valid Pact. Could be that it was previously deleted.', E_USER_WARNING);

diff --git a/tests/PhpPact/Consumer/Driver/Pact/PactDriverTest.php b/tests/PhpPact/Consumer/Driver/Pact/PactDriverTest.php
@@ -81,7 +81,7 @@ public function testCleanUp(): void
 
     public function testCleanUpWithoutPact(): void
     {
-        $this->expectException(MissingPactException::class);
+        $this->expectNotToPerformAssertions();
         $this->driver->cleanUp();
     }
 

diff --git a/tests/PhpPact/Plugin/Driver/Pact/AbstractPluginPactDriverTestCase.php b/tests/PhpPact/Plugin/Driver/Pact/AbstractPluginPactDriverTestCase.php
@@ -2,7 +2,6 @@
 
 namespace PhpPactTest\Plugin\Driver\Pact;
 
-use PhpPact\Consumer\Driver\Exception\MissingPactException;
 use PhpPact\Plugin\Driver\Pact\AbstractPluginPactDriver;
 use PhpPact\Plugin\Exception\PluginNotSupportedBySpecificationException;
 use PhpPactTest\Consumer\Driver\Pact\PactDriverTest;
@@ -51,7 +50,7 @@ public function testCleanUpPlugin(): void
 
     public function testCleanUpPluginWithoutPact(): void
     {
-        $this->expectException(MissingPactException::class);
+        $this->expectNotToPerformAssertions();
         $this->driver->cleanUp();
     }