Add a fix for transactional database test

cash-track · Apr 19, 2023 · c4a80ab · c4a80ab
1 parent 275f295
commit c4a80ab
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -59,9 +59,16 @@ protected function scopedDatabase(): void
         $db = $this->getContainer()->get(DatabaseInterface::class);
         $db->begin();
 
-//        $this->getContainer()->get(FinalizerInterface::class)->addFinalizer(static function () use ($db) {
-//            $db->rollback();
-//        });
+        $this->getContainer()->get(FinalizerInterface::class)->addFinalizer(static function () use ($db) {
+            /** @var \Cycle\Database\DatabaseInterface $db */
+            $db = $this->getContainer()->get(DatabaseInterface::class);
+
+            while ($db->getDriver()->getTransactionLevel() !== 0) {
+                if (! $db->rollback()) {
+                    return;
+                }
+            }
+        });
     }
 
     protected function scopedDatabaseFinalise(): void
@@ -82,7 +89,7 @@ protected function scopedDatabaseFinalise(): void
 
     protected function tearDown(): void
     {
-        $this->scopedDatabaseFinalise();
+//        $this->scopedDatabaseFinalise();
 
         parent::tearDown();