Fix test to use the new features

Author: DEVizzent

tests/Integration/NotMatchedRequestTest.php

@@ -20,17 +20,22 @@ private function initialize(string $notMatchedRequestConfig): void
         $moduleContainer = $this->createMock(ModuleContainer::class);
         $this->sot = new MockServerHelper(
             $moduleContainer,
-            ['url' => 'http://mockserver:1080', 'notMatchedRequest' => $notMatchedRequestConfig]
+            [
+                'url' => 'http://mockserver:1080',
+                'notMatchedRequest' => $notMatchedRequestConfig,
+                'expectationsPath' => __DIR__ . '/../../docker/mockserver/expectations',
+            ]
         );
         $this->sot->_initialize();
+        $this->sot->_beforeSuite();
         $this->client = new Client(['proxy' => 'http://mockserver:1080', 'verify' => false]);
         $this->sot->clearMockServerLogs();
     }
 
     protected function tearDown(): void
     {
+        $this->sot->removeAllMockRequest();
         parent::tearDown();
-        $this->sot->deactivateNotMatchedRequest();
     }
 
     public function testActivateNotMatchedRequestCreateExpectation()

tests/Integration/SeeAllRequestWereMatchedTest.php

@@ -17,13 +17,24 @@ class SeeAllRequestWereMatchedTest extends TestCase
     protected function initialize(string $notMatchedRequest): void
     {
         $moduleContainer = $this->createMock(ModuleContainer::class);
-        $config = ['url' => 'http://mockserver:1080', 'notMatchedRequest' => $notMatchedRequest];
+        $config = [
+            'url' => 'http://mockserver:1080',
+            'notMatchedRequest' => $notMatchedRequest,
+            'expectationsPath' => __DIR__ . '/../../docker/mockserver/expectations',
+        ];
         $this->sot = new MockServerHelper($moduleContainer, $config);
         $this->sot->_initialize();
+        $this->sot->_beforeSuite();
         $this->client = new Client(['proxy' => 'http://mockserver:1080', 'verify' => false]);
         $this->sot->clearMockServerLogs();
     }
 
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        $this->sot->removeAllMockRequest();
+    }
+
     public function testAllRequestWereMatchedWhenConfigDisabledThrowException(): void
     {
         $this->initialize(NotMatchedRequest::DISABLED);

tests/Integration/SeeMockRequestWasCalledTest.php

@@ -17,12 +17,23 @@ protected function setUp(): void
     {
         parent::setUp();
         $moduleContainer = $this->createMock(ModuleContainer::class);
-        $this->sot = new MockServerHelper($moduleContainer, ['url' => 'http://mockserver:1080']);
+        $config = [
+            'url' => 'http://mockserver:1080',
+            'expectationsPath' => __DIR__ . '/../../docker/mockserver/expectations',
+        ];
+        $this->sot = new MockServerHelper($moduleContainer, $config);
         $this->sot->_initialize();
+        $this->sot->_beforeSuite();
         $this->client = new Client(['proxy' => 'http://mockserver:1080', 'verify' => false]);
         $this->sot->clearMockServerLogs();
     }
 
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        $this->sot->removeAllMockRequest();
+    }
+
     public function testExpectationWasCalled(): void
     {
         $this->client->request('GET', 'https://jsonplaceholder.typicode.com/posts/1');

tests/Integration/SeeMockRequestWasNotCalledTest.php

@@ -16,13 +16,24 @@ class SeeMockRequestWasNotCalledTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
+        $config = [
+            'url' => 'http://mockserver:1080',
+            'expectationsPath' => __DIR__ . '/../../docker/mockserver/expectations',
+        ];
         $moduleContainer = $this->createMock(ModuleContainer::class);
-        $this->sot = new MockServerHelper($moduleContainer, ['url' => 'http://mockserver:1080']);
+        $this->sot = new MockServerHelper($moduleContainer, $config);
         $this->sot->_initialize();
+        $this->sot->_beforeSuite();
         $this->client = new Client(['proxy' => 'http://mockserver:1080', 'verify' => false]);
         $this->sot->clearMockServerLogs();
     }
 
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        $this->sot->removeAllMockRequest();
+    }
+
     public function testExpectationWasNotCalled(): void
     {
         $this->sot->seeMockRequestWasNotCalled('get-post-2');