Updated focused specs PR to address review feedback.

specs/suite.spec.php

@@ -231,7 +231,7 @@
             it('should return true even if nested tests are not focused', function() {
                 $test = new Test("test", function() {});
                 $this->suite->addTest($test);
-                assert($this->suite->getFocused(), "suite should not be focused");
+                assert($this->suite->getFocused(), "suite should be focused");
             });
         });
 

src/Core/Suite.php

@@ -29,13 +29,17 @@ class Suite extends AbstractTest
      */
     public function getFocused()
     {
+        if ($this->focused === true) {
+            return $this->focused;
+        }
+
         foreach ($this->tests as $test) {
             if ($test->getFocused()) {
                 return true;
             }
         }
 
-        return $this->focused;
+        return false;
     }
 
     /**
@@ -90,7 +94,7 @@ public function run(TestResult $result)
         $this->eventEmitter->emit('suite.start', [$this]);
         $this->eventEmitter->on('suite.halt', [$this, 'halt']);
 
-        foreach ($this->focusedTests() as $test) {
+        foreach ($this->getTestsToRun() as $test) {
             if ($this->halted) {
                 break;
             }
@@ -128,22 +132,17 @@ protected function runTest(TestInterface $test, TestResult $result)
         $test->run($result);
     }
 
-    private function focusedTests()
+    /**
+     * Get the subset of the defined tests that should actually be run.
+     *
+     * @return array
+     */
+    protected function getTestsToRun()
     {
-        $tests = [];
-        $hasFocusedTests = false;
-
-        foreach ($this->tests as $test) {
-            if ($test->getFocused()) {
-                $hasFocusedTests = true;
-                $tests[] = $test;
-            }
-        }
+        $tests = array_filter($this->tests, function (TestInterface $test) {
+            return $test->getFocused();
+        });
 
-        if ($hasFocusedTests) {
-            return $tests;
-        }
-
-        return $this->tests;
+        return empty($tests) ? $this->tests : $tests;
     }
 }

src/Dsl.php

@@ -20,7 +20,7 @@ function describe($description, callable $fn)
  */
 function context($description, callable $fn)
 {
-    Context::getInstance()->addSuite($description, $fn);
+    describe($description, $fn);
 }
 
 /**