Restructure tests

- Avoid database leftovers
2023-02-13 20:52:24 +01:00
parent 704508fc65
commit e1813e3d73
11 changed files with 161 additions and 104 deletions
@@ -32,6 +32,8 @@ use GuzzleHttp\HandlerStack;
 */
 trait DiceHttpMockHandlerTrait
 {
+	use FixtureTestTrait;
+
 	/**
 	 * Handler for mocking requests anywhere for testing purpose
 	 *
@@ -41,9 +43,7 @@ trait DiceHttpMockHandlerTrait

 	protected function setupHttpMockHandler(): void
 	{
-		if (!empty($this->httpRequestHandler) && $this->httpRequestHandler instanceof HandlerStack) {
-			return;
-		}
+		$this->setUpFixtures();

 		$this->httpRequestHandler = HandlerStack::create();

@@ -59,10 +59,8 @@ trait DiceHttpMockHandlerTrait
 		DI::init($newDice);
 	}

-	protected function tearDown(): void
+	protected function tearDownHandler(): void
 	{
-		\Mockery::close();
-
-		parent::tearDown();
+		$this->tearDownFixtures();
 	}
 }