Merge pull request #76 from edmondscommerce/DeEmphasiseSkippedTests

De emphasise skipped tests

Author: edmondscommerce

includes/generic/phpunit.inc.bash

@@ -39,9 +39,13 @@ do
         # No Coverage mode - do not generate coverage, do enforce time limits
         extraConfigs+=( --no-coverage )
         extraConfigs+=( --enforce-time-limit )
-    else
-        # Coverage generation mode (slow) - stop on first error, do not enforce time limits
+    elif [[ "false" != "${CI:-'false'}" ]]
+    then
+        # When in CI and generating coverage - stop on first error, do not enforce time limits
         extraConfigs+=( --stop-on-failure --stop-on-error --stop-on-defect --stop-on-warning )
+    else
+        # Default mode - do generate coverage if configured to do so, do enforce time limits
+        extraConfigs+=( --enforce-time-limit )
     fi
     set +e
     set -x

src/PHPUnit/TestDox/CliTestDoxPrinter.php

@@ -26,21 +26,19 @@
  */
 class CliTestDoxPrinter extends ResultPrinter
 {
+    private const SYMBOL_SKIP = '→';
     /**
      * @var \EdmondsCommerce\PHPQA\PHPUnit\TestDox\TestResult
      */
     private $currentTestResult;
-
     /**
      * @var \EdmondsCommerce\PHPQA\PHPUnit\TestDox\TestResult
      */
     private $previousTestResult;
-
     /**
      * @var \EdmondsCommerce\PHPQA\PHPUnit\TestDox\TestResult[]
      */
     private $nonSuccessfulTestResults = [];
-
     /**
      * @var NamePrettifier
      */
@@ -179,12 +177,13 @@ public function addRiskyTest(Test $test, \Throwable $t, float $time): void
     public function addSkippedTest(Test $test, \Throwable $t, float $time): void
     {
         $this->currentTestResult->fail(
-            $this->formatWithColor('fg-yellow', '→'),
+            $this->formatWithColor('fg-yellow', self::SYMBOL_SKIP),
             (string)$t,
             true
         );
     }
 
+
     public function writeProgress(string $progress): void
     {
     }
@@ -219,14 +218,34 @@ private function printNonSuccessfulTestsSummary(int $numberOfExecutedTests): voi
             return;
         }
 
-        $this->write("Summary of non-successful tests:\n\n");
+        $this->write(
+            $this->formatWithColor(
+                'fg-yellow',
+                "Summary of non-successful tests:"
+            )
+            . "\n\n"
+        );
 
         $previousTestResult = null;
 
+        $skippedTests = 0;
         foreach ($this->nonSuccessfulTestResults as $testResult) {
-            $this->write($testResult->toString($previousTestResult, $this->verbose));
+            $line = $testResult->toString($previousTestResult, $this->verbose);
+            if (false !== \strpos($line, self::SYMBOL_SKIP)) {
+                $skippedTests++;
+                continue;
+            }
+            $this->write($line);
 
             $previousTestResult = $testResult;
         }
+        if ($skippedTests > 0) {
+            $this->write(
+                $this->formatWithColor(
+                    'fg-yellow',
+                    "\n" . self::SYMBOL_SKIP . ' Skipped Tests: ' . $skippedTests . "\n\n"
+                )
+            );
+        }
     }
 }