Print steps output with pretty formatter

Behat · stof · Mar 12, 2014 · Mar 5, 2014 · Mar 5, 2014 · Mar 5, 2014
commit fe958a9daf749dbecd183103457d5bccd44ec5f3
diff --git a/features/dry_run.feature b/features/dry_run.feature
@@ -93,15 +93,17 @@ Feature: Dry run
         As a little kid
         I need to have an apple in my pocket
 
+        Background:
+          Given I have 3 apples
+            │ STEP: I have 3 apples
+
         ┌─ @BeforeScenario # FeatureContext::beforeScenario()
         │
         │  HOOK: before scenario
         │
-        Background:
+        Scenario: I'm little hungry
           Given I have 3 apples
             │ STEP: I have 3 apples
-
-        Scenario: I'm little hungry
           When I ate 1 apple
             │ STEP: I ate 1 apples
           Then I should have 3 apples
@@ -112,6 +114,8 @@ Feature: Dry run
         │  HOOK: before scenario
         │
         Scenario: Found more apples
+          Given I have 3 apples
+            │ STEP: I have 3 apples
           When I found 5 apples
             │ STEP: I found 5 apples
           Then I should have 8 apples
@@ -122,6 +126,8 @@ Feature: Dry run
         │  HOOK: before scenario
         │
         Scenario: Found more apples
+          Given I have 3 apples
+            │ STEP: I have 3 apples
           When I found 2 apples
             │ STEP: I found 2 apples
           Then I should have 5 apples
@@ -175,8 +181,8 @@ Feature: Dry run
         As a little kid
         I need to have an apple in my pocket
 
-        Background:                   # features/apples.feature:6
-          Given I have 3 apples       # FeatureContext::iHaveApples()
+        Background:             # features/apples.feature:6
+          Given I have 3 apples # FeatureContext::iHaveApples()
 
         Scenario: I'm little hungry   # features/apples.feature:9
           When I ate 1 apple          # FeatureContext::iAteApples()
@@ -201,6 +207,15 @@ Feature: Dry run
             | 0   | 4     | 8      |
             | 2   | 2     | 3      |
 
+      --- Skipped scenarios:
+
+          features/apples.feature:9
+          features/apples.feature:13
+          features/apples.feature:17
+          features/apples.feature:28
+          features/apples.feature:29
+          features/apples.feature:30
+
       6 scenarios (6 skipped)
       21 steps (21 skipped)
       """
diff --git a/src/Behat/Behat/Output/Node/Printer/Pretty/PrettyExampleRowPrinter.php b/src/Behat/Behat/Output/Node/Printer/Pretty/PrettyExampleRowPrinter.php
@@ -15,6 +15,7 @@
 use Behat\Behat\Output\Node\Printer\Helper\ResultToStringConverter;
 use Behat\Behat\Tester\Exception\PendingException;
 use Behat\Behat\Tester\Result\ExceptionResult;
+use Behat\Behat\Tester\Result\ExecutedStepResult;
 use Behat\Behat\Tester\Result\StepResult;
 use Behat\Gherkin\Node\ExampleNode;
 use Behat\Gherkin\Node\OutlineNode;
@@ -34,7 +35,7 @@
 class PrettyExampleRowPrinter implements ExampleRowPrinter
 {
     /**
-     * @var \Behat\Behat\Output\Node\Printer\Helper\ResultToStringConverter
+     * @var ResultToStringConverter
      */
     private $resultConverter;
     /**
@@ -80,7 +81,7 @@ public function printExampleRow(Formatter $formatter, OutlineNode $outline, Exam
         $row = $outline->getExampleTable()->getRowAsStringWithWrappedValues($rowNum, $wrapper);
 
         $formatter->getOutputPrinter()->writeln(sprintf('%s%s', $this->indentText, $row));
-        $this->printStepExceptions($formatter->getOutputPrinter(), $events);
+        $this->printStepExceptionsAndStdOut($formatter->getOutputPrinter(), $events);
     }
 
     /**
@@ -120,11 +121,12 @@ private function getWrapperClosure(OutlineNode $outline, ExampleNode $example, a
      * Prints step events exceptions (if has some).
      *
      * @param OutputPrinter $printer
-     * @param StepTested[]  $events
+     * @param AfterTested[] $events
      */
-    private function printStepExceptions(OutputPrinter $printer, array $events)
+    private function printStepExceptionsAndStdOut(OutputPrinter $printer, array $events)
     {
         foreach ($events as $event) {
+            $this->printStepStdOut($printer, $event->getTestResult());
             $this->printStepException($printer, $event->getTestResult());
         }
     }
@@ -153,6 +155,30 @@ private function printStepException(OutputPrinter $printer, StepResult $result)
         $printer->writeln(sprintf('{+%s}%s{-%s}', $style, $indentedText, $style));
     }
 
+    /**
+     * Prints step output (if has one).
+     *
+     * @param OutputPrinter $printer
+     * @param StepResult    $result
+     */
+    private function printStepStdOut(OutputPrinter $printer, StepResult $result)
+    {
+        if (!$result instanceof ExecutedStepResult || null === $result->getCallResult()->getStdOut()) {
+            return;
+        }
+
+        $callResult = $result->getCallResult();
+        $indentedText = $this->subIndentText;
+
+        $pad = function ($line) use ($indentedText) {
+            return sprintf(
+                '%s│ {+stdout}%s{-stdout}', $indentedText, $line
+            );
+        };
+
+        $printer->writeln(implode("\n", array_map($pad, explode("\n", $callResult->getStdOut()))));
+    }
+
     /**
      * Indents text to the subIndentation level.
      *

diff --git a/src/Behat/Behat/Output/Node/Printer/Pretty/PrettyStepPrinter.php b/src/Behat/Behat/Output/Node/Printer/Pretty/PrettyStepPrinter.php
@@ -17,6 +17,7 @@
 use Behat\Behat\Tester\Exception\PendingException;
 use Behat\Behat\Tester\Result\DefinedStepResult;
 use Behat\Behat\Tester\Result\ExceptionResult;
+use Behat\Behat\Tester\Result\ExecutedStepResult;
 use Behat\Behat\Tester\Result\StepResult;
 use Behat\Gherkin\Node\ArgumentInterface;
 use Behat\Gherkin\Node\PyStringNode;
@@ -98,6 +99,7 @@ public function printStep(Formatter $formatter, Scenario $scenario, StepNode $st
         }
 
         $this->printArguments($formatter, $step->getArguments(), $result);
+        $this->printStdOut($formatter->getOutputPrinter(), $result);
         $this->printException($formatter->getOutputPrinter(), $result);
     }
 
@@ -165,6 +167,30 @@ private function printArguments(Formatter $formatter, array $arguments, StepResu
         }
     }
 
+    /**
+     * Prints step output (if has one).
+     *
+     * @param OutputPrinter $printer
+     * @param StepResult    $result
+     */
+    private function printStdOut(OutputPrinter $printer, StepResult $result)
+    {
+        if (!$result instanceof ExecutedStepResult || null === $result->getCallResult()->getStdOut()) {
+            return;
+        }
+
+        $callResult = $result->getCallResult();
+        $indentedText = $this->subIndentText;
+
+        $pad = function ($line) use ($indentedText) {
+            return sprintf(
+                '%s│ {+stdout}%s{-stdout}', $indentedText, $line
+            );
+        };
+
+        $printer->writeln(implode("\n", array_map($pad, explode("\n", $callResult->getStdOut()))));
+    }
+
     /**
      * Prints step exception (if has one).
      *