Merge branch 'MDL-73883-311' of https://github.com/andrewnicols/moodle into MOODLE_311_STABLE

2022-02-21 15:35:19 +01:00
parent 0196f5326f 781c3438c2
commit 7a87dac5cd
1 changed files with 7 additions and 1 deletions
@@ -125,7 +125,13 @@ class ChainedStepTester implements StepTester {
            // Extra step, looking for a moodle exception, a debugging() message or a PHP debug message.
            $checkingStep = new StepNode('Given', self::EXCEPTIONS_STEP_TEXT, array(), $step->getLine());
            $afterExceptionCheckingEvent = $this->singlesteptester->test($env, $feature, $checkingStep, $skip);
-            return $this->checkSkipResult($afterExceptionCheckingEvent);
+            $exceptionCheckResult = $this->checkSkipResult($afterExceptionCheckingEvent);
+
+            if (!$exceptionCheckResult->isPassed()) {
+                return $exceptionCheckResult;
+            }
+
+            return $result;
        }

        return $this->runChainedSteps($env, $feature, $result, $skip);