roll back transactions for tests marked as incomplete in setUp()

dmaicher · Feb 1, 2025 · 1ffef30 · 1ffef30
1 parent 866bbbf
commit 1ffef30
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/DAMA/DoctrineTestBundle/PHPUnit/PHPUnitExtension.php b/src/DAMA/DoctrineTestBundle/PHPUnit/PHPUnitExtension.php
@@ -3,6 +3,8 @@
 namespace DAMA\DoctrineTestBundle\PHPUnit;
 
 use DAMA\DoctrineTestBundle\Doctrine\DBAL\StaticDriver;
+use PHPUnit\Event\Test\BeforeTestMethodErrored;
+use PHPUnit\Event\Test\BeforeTestMethodErroredSubscriber;
 use PHPUnit\Event\Test\Errored;
 use PHPUnit\Event\Test\ErroredSubscriber;
 use PHPUnit\Event\Test\Finished as TestFinishedEvent;
@@ -75,6 +77,14 @@ public function notify(TestFinishedEvent $event): void
                 }
             });
 
+            $facade->registerSubscriber(new class implements BeforeTestMethodErroredSubscriber {
+                public function notify(BeforeTestMethodErrored $event): void
+                {
+                    // needed for tests marked incomplete during setUp()
+                    PHPUnitExtension::rollBack();
+                }
+            });
+
             $facade->registerSubscriber(new class implements ErroredSubscriber {
                 public function notify(Errored $event): void
                 {

diff --git a/tests/Functional/PhpunitTest.php b/tests/Functional/PhpunitTest.php
@@ -18,6 +18,11 @@ protected function setUp(): void
         if ((method_exists($this, 'name') ? $this->name() : $this->getName()) === 'testSkippedTestDuringSetup') {
             $this->markTestSkipped();
         }
+
+        /** @phpstan-ignore-next-line */
+        if ((method_exists($this, 'name') ? $this->name() : $this->getName()) === 'testIncompleteTestDuringSetup') {
+            $this->markTestIncomplete();
+        }
     }
 
     public function testChangeDbState(): void
@@ -147,6 +152,11 @@ public function testSkippedTestDuringSetup(): void
         $this->expectNotToPerformAssertions();
     }
 
+    public function testIncompleteTestDuringSetup(): void
+    {
+        $this->expectNotToPerformAssertions();
+    }
+
     public function testMarkIncomplete(): void
     {
         $this->markTestIncomplete();