Merge pull request #6482 from Codeception/5.0-merge-4.2

Merge 4.2 to 5.0
Codeception · Jun 22, 2022 · 4a5f2f4 · 4a5f2f4
2 parents 522c7f0 + a3a2775
commit 4a5f2f4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/CHANGELOG-4.x.md b/CHANGELOG-4.x.md
@@ -1,3 +1,8 @@
+#### 4.2.1
+
+* Execute setupBeforeClass/tearDownAfterClass only once (#6481)
+* Handle action with intersection return type correctly in dry-run command
+
 #### 4.2.0
 
 * Improved multi-application experience, allow filtering suites by name (#6435) by @calvinalkan

diff --git a/src/Codeception/Subscriber/BeforeAfterTest.php b/src/Codeception/Subscriber/BeforeAfterTest.php
@@ -32,6 +32,8 @@ class BeforeAfterTest implements EventSubscriberInterface
 
     public function beforeClass(SuiteEvent $event): void
     {
+        $this->hooks = [];
+
         foreach ($event->getSuite()->getTests() as $test) {
             $testClass = $test::class;
             if (PHPUnitVersion::series() < 10) {

diff --git a/tests/cli/OrderCest.php b/tests/cli/OrderCest.php
@@ -116,4 +116,12 @@ public function checkBootstrapIsLoadedBeforeTests(CliGuy $I)
         $I->seeFileFound('order.txt', 'tests/_output');
         $I->seeInThisFile('BIBP(T)');
     }
+
+    public function checkAfterBeforeHooksAreExecutedOnlyOnce(CliGuy $I)
+    {
+        $I->amInPath('tests/data/sandbox');
+        $I->executeCommand('run math,order,scenario,skipped :BeforeAfterClassTest');
+        $I->seeFileFound('order.txt', 'tests/_output');
+        $I->seeInThisFile('BIBP({[1][2]})');
+    }
 }