Added ability to define multiple before/afterSpecify callbacks

Author: tankist

src/Codeception/Specify.php

@@ -6,8 +6,8 @@
 
 trait Specify {
 
-    private $beforeSpecify;
-    private $afterSpecify;
+    private $beforeSpecify = array();
+    private $afterSpecify = array();
 
     /**
      * @var Specify\Config
@@ -46,15 +46,23 @@ function specify($specification, \Closure $callable = null, $params = [])
             // copy current object properties
             $this->specifyCloneProperties($properties);
 
-            if ($this->beforeSpecify instanceof \Closure) $this->beforeSpecify->__invoke();
+            if (!empty($this->beforeSpecify) && is_array($this->beforeSpecify)) {
+                foreach ($this->beforeSpecify as $closure) {
+                    if ($closure instanceof \Closure) $closure->__invoke();
+                }
+            }
             $this->specifyExecute($test, $throws, $example);
 
             // restore object properties
             foreach ($properties as $property => $val) {
                 if ($this->specifyConfig->propertyIgnored($property)) continue;
                 $this->$property = $val;
             }
-            if ($this->afterSpecify instanceof \Closure) $this->afterSpecify->__invoke();
+            if (!empty($this->afterSpecify) && is_array($this->afterSpecify)) {
+                foreach ($this->afterSpecify as $closure) {
+                    if ($closure instanceof \Closure) $closure->__invoke();
+                }
+            }
         }
 
         // restore test name
@@ -126,17 +134,17 @@ public function specifyConfig()
 
     function beforeSpecify(\Closure $callable = null)
     {
-        $this->beforeSpecify = $callable->bindTo($this);
+        $this->beforeSpecify[] = $callable->bindTo($this);
     }
 
     function afterSpecify(\Closure $callable = null)
     {
-        $this->afterSpecify = $callable->bindTo($this);
+        $this->afterSpecify[] = $callable->bindTo($this);
     }
 
     function cleanSpecify()
     {
-        $this->beforeSpecify = $this->afterSpecify = null;
+        $this->beforeSpecify = $this->afterSpecify = array();
     }
 
     /**

tests/SpecifyTest.php

@@ -35,6 +35,19 @@ function testBeforeCallback()
         });
     }
 
+    function testMultiBeforeCallback()
+    {
+        $this->beforeSpecify(function() {
+            $this->user = "davert";
+        });
+        $this->beforeSpecify(function() {
+            $this->user .= "jon";
+        });
+        $this->specify("user should be davertjon", function() {
+            $this->assertEquals('davertjon', $this->user);
+        });
+    }
+
     function testAfterCallback()
     {
         $this->afterSpecify(function() {
@@ -46,6 +59,20 @@ function testAfterCallback()
         $this->assertEquals('davert', $this->user);
     }    
 
+    function testMultiAfterCallback()
+    {
+        $this->afterSpecify(function() {
+            $this->user = "davert";
+        });
+        $this->afterSpecify(function() {
+            $this->user .= "jon";
+        });
+        $this->specify("user should be davertjon", function() {
+            $this->user = "jon";
+        });
+        $this->assertEquals('davertjon', $this->user);
+    }
+
     function testCleanSpecifyCallbacks()
     {
         $this->afterSpecify(function() {