Merge pull request #10 from OndraM/fix/phpunit-colors

Properly trigger PHPUnit colored mode
lmc-eu · May 19, 2015 · 8e555f8 · 8e555f8
2 parents 834f69a + c446ffb
commit 8e555f8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,9 @@
 - The `logs/results.xml` could now be also accessed locally (the XSLT is now embedded right into the file, so we don't encounter same-origin policy problems).
 - Use tagged version 0.6.0 of [php-webdriver](https://github.com/facebook/php-webdriver)
 
+### Fixed
+- Properly trigger PHPUnit colored (ANSI) mode when Steward itself is in ANSI mode.
+
 ## 1.0.0 - 2015-05-09
 ### Added
 - Possibility to specify zero as `@delayMinutes` (eg. if you want to force test order, but don't need to actually wait) or to use floating point number as delay.

diff --git a/src-tests/Process/ProcessSetCreatorTest.php b/src-tests/Process/ProcessSetCreatorTest.php
@@ -215,7 +215,7 @@ public function testShouldSetPHPUnitColoredOptionOnlyIfTheOutputIsDecorated()
         /** @var Process $process */
         $process = $processSet->get(ProcessSet::PROCESS_STATUS_QUEUED)[self::NAME_DUMMY_TEST]->process;
         $commandWithColors = $process->getCommandLine();
-        $this->assertContains('--colors', $commandWithColors);
+        $this->assertContains('--colors=always', $commandWithColors);
     }
 
     public function testShouldDispatchProcessEvent()

diff --git a/src/Process/ProcessSetCreator.php b/src/Process/ProcessSetCreator.php
@@ -128,7 +128,7 @@ public function createFromFiles(Finder $files, array $groups = null, array $excl
 
             // If ANSI output is enabled, turn on colors in PHPUnit
             if ($this->output->isDecorated()) {
-                $phpunitArgs[] = '--colors';
+                $phpunitArgs[] = '--colors=always';
             }
 
             $processSet->add(