Reverse afterEach/afterAll hooks execution order.

kahlan · Mar 13, 2019 · 439415b · 439415b
1 parent 6c14e95
commit 439415b
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 2 deletions.
diff --git a/spec/Suite/Suite.spec.php b/spec/Suite/Suite.spec.php
@@ -137,6 +137,82 @@
 
         });
 
+        it("runs nested `afterEach()` in the correct order", function () {
+
+            $order = [];
+
+            $describe = $this->root->describe("", function () use (&$order) {
+
+                $this->afterEach(function () use (&$order) {
+                    $order[] = 'level1';
+                });
+
+                $this->describe("describe", function () use (&$order) {
+
+                    $this->afterEach(function () use (&$order) {
+                        $order[] = 'level2a';
+                    });
+
+                    $this->afterEach(function () use (&$order) {
+                        $order[] = 'level2b';
+                    });
+
+                    $this->it("it1", function () {
+                        expect(true)->toBe(true);
+                    });
+
+                    $this->it("it2", function () {
+                        expect(true)->toBe(true);
+                    });
+
+                });
+
+            });
+
+            $this->suite->run();
+
+            expect($order)->toBe(['level2b', 'level2a', 'level1', 'level2b', 'level2a', 'level1']);
+
+        });
+
+        it("runs nested `afterAll()` in the correct order", function () {
+
+            $order = [];
+
+            $describe = $this->root->describe("", function () use (&$order) {
+
+                $this->afterAll(function () use (&$order) {
+                    $order[] = 'level1';
+                });
+
+                $this->describe("describe", function () use (&$order) {
+
+                    $this->afterAll(function () use (&$order) {
+                        $order[] = 'level2a';
+                    });
+
+                    $this->afterAll(function () use (&$order) {
+                        $order[] = 'level2b';
+                    });
+
+                    $this->it("it1", function () {
+                        expect(true)->toBe(true);
+                    });
+
+                    $this->it("it2", function () {
+                        expect(true)->toBe(true);
+                    });
+
+                });
+
+            });
+
+            $this->suite->run();
+
+            expect($order)->toBe(['level2b', 'level2a', 'level1']);
+
+        });
+
         it("reports errors occuring in describes", function () {
 
             skipIf(defined('HHVM_VERSION') || PHP_MAJOR_VERSION < 7);

diff --git a/src/Block/Group.php b/src/Block/Group.php
@@ -281,7 +281,7 @@ public function beforeAll($closure)
      */
     public function afterAll($closure)
     {
-        $this->_callbacks['afterAll'][] = $this->_bindScope($closure);
+        array_unshift($this->_callbacks['afterAll'], $this->_bindScope($closure));
         return $this;
     }
 
@@ -307,7 +307,7 @@ public function beforeEach($closure)
      */
     public function afterEach($closure)
     {
-        $this->_callbacks['afterEach'][] = $this->_bindScope($closure);
+        array_unshift($this->_callbacks['afterEach'], $this->_bindScope($closure));
         return $this;
     }
 
@@ -392,6 +392,9 @@ protected function _blockEnd($runAfterAll = true)
     public function runCallbacks($name, $recursive = true)
     {
         $instances = $recursive ? $this->parents(true) : [$this];
+        if (strncmp($name, 'after', 5) === 0) {
+            $instances = array_reverse($instances);
+        }
         foreach ($instances as $instance) {
             foreach ($instance->_callbacks[$name] as $closure) {
                 $this->_suite->runBlock($this, $closure, $name);