Added test for Codeception#3686, minor refactoring (Codeception#3697)

src/Codeception/Module/Filesystem.php

@@ -265,7 +265,7 @@ public function seeFileFound($filename, $path = '')
             \PHPUnit_Framework_Assert::assertFileExists($file);
             return;
         }
-        $this->fail("$filename in $path");
+        $this->fail("File \"$filename\" not found at \"$path\"");
     }
 
     /**

src/Codeception/Subscriber/Console.php

@@ -187,13 +187,14 @@ public function startTest(TestEvent $e)
     public function afterStep(StepEvent $e)
     {
         $step = $e->getStep();
-        if ($step->hasFailed()) {
-            if ($step instanceof Step\ConditionalAssertion) {
-                $this->conditionalFails[] = $step;
-            } else {
-                $this->failedStep = $step;
-            }
+        if (!$step->hasFailed()) {
+            return;
+        }
+        if ($step instanceof Step\ConditionalAssertion) {
+            $this->conditionalFails[] = $step;
+            return;
         }
+        $this->failedStep = $step;
     }
 
     /**

tests/cli/RunCest.php

@@ -421,4 +421,13 @@ public function runTestWithAnnotationExamplesFromGroupFileTest(CliGuy $I)
         $I->executeCommand('run scenario -g groupFileTest1 --steps');
         $I->seeInShellOutput('OK (3 tests');
     }
+
+    public function testsWithConditionalFails(CliGuy $I)
+    {
+        $I->executeCommand('run scenario ConditionalCept --no-exit');
+        $I->seeInShellOutput('There were 3 failures');
+        $I->seeInShellOutput('Fail  File "not-a-file" not found');
+        $I->seeInShellOutput('Fail  File "not-a-dir" not found');
+        $I->seeInShellOutput('Fail  File "nothing" not found');
+    }
 }

tests/data/claypit/tests/scenario/ConditionalCept.php

@@ -0,0 +1,6 @@
+<?php
+$I = new ScenarioGuy($scenario);
+$I->amInPath('.');
+$I->canSeeFileFound('not-a-file');
+$I->canSeeFileFound('not-a-dir');
+$I->canSeeFileFound('nothing');