update all scope references to Peridot\Core\Scope

peridot-php · Nov 16, 2014 · 24866ac · 24866ac
1 parent 0002256
commit 24866ac
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/specs/suite.spec.php b/specs/suite.spec.php
@@ -3,7 +3,7 @@
 use Peridot\Core\Test;
 use Peridot\Core\TestResult;
 use Peridot\Core\Suite;
-use Peridot\Scope\Scope;
+use Peridot\Core\Scope;
 use Peridot\Test\ItWasRun;
 
 describe("Suite", function() {

diff --git a/specs/test.spec.php b/specs/test.spec.php
@@ -3,7 +3,7 @@
 use Peridot\Core\Test;
 use Peridot\Core\TestResult;
 use Peridot\Core\Suite;
-use Peridot\Scope\Scope;
+use Peridot\Core\Scope;
 use Peridot\Test\ItWasRun;
 
 describe("Test", function() {

diff --git a/src/Core/AbstractTest.php b/src/Core/AbstractTest.php
@@ -2,8 +2,6 @@
 
 namespace Peridot\Core;
 
-use Peridot\Scope\ScopeTrait;
-
 /**
  * Base class for Peridot Suites and Tests
  *
@@ -12,7 +10,6 @@
 abstract class AbstractTest implements TestInterface
 {
     use HasEventEmitterTrait;
-    use ScopeTrait;
 
     /**
      * The test definition as a callable.
@@ -50,6 +47,11 @@ abstract class AbstractTest implements TestInterface
      */
     protected $pending = null;
 
+    /**
+     * @var Scope
+     */
+    protected $scope;
+
     /**
      * @param string   $description
      * @param callable $definition
@@ -58,6 +60,7 @@ public function __construct($description, callable $definition)
     {
         $this->definition = $definition;
         $this->description = $description;
+        $this->scope = new Scope();
     }
 
     /**
@@ -212,4 +215,28 @@ public function forEachNodeTopDown(callable $fn)
             $fn($node);
         }
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return Scope
+     */
+    public function getScope()
+    {
+        return $this->scope;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param Scope $scope
+     * @return mixed
+     */
+    public function setScope(Scope $scope)
+    {
+        $this->scope = $scope;
+        return $this;
+    }
+
+
 }
diff --git a/src/Core/TestInterface.php b/src/Core/TestInterface.php
@@ -2,7 +2,6 @@
 namespace Peridot\Core;
 
 use Evenement\EventEmitterInterface;
-use Peridot\Scope\Scope;
 
 /**
  * Defines the contract for Peridot test fixtures like Test and Suite