Merge 85a47fa into ab5ce21

valfirst · Jun 22, 2018 · 1d43789 · 1d43789
2 parents ab5ce21 + 85a47fa
commit 1d43789
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/main/java/com/github/valfirst/jbehave/junit/monitoring/JUnitScenarioReporter.java b/src/main/java/com/github/valfirst/jbehave/junit/monitoring/JUnitScenarioReporter.java
@@ -297,13 +297,17 @@ public void successful(String step) {
 
 	private void prepareNextStep() {
 		TestState testState = this.testState.get();
-		if (testState.currentStep != null && testState.currentStep.isTest()) {
-			testCounter.incrementAndGet();
+		if (testState.currentStep != null) {
+			if (testState.currentStep.isTest()) {
+				testCounter.incrementAndGet();
+			}
+			// Lifecycle After story steps
+			if(testState.currentStep == testState.currentScenario) {
+				testState.moveToNextScenario();
+				return;
+			}
 		}
-		// Lifecycle After story steps
-		if (testState.currentStep == testState.currentScenario) {
-			testState.moveToNextScenario();
-		} else if (testState.stepDescriptions != null) {
+		if (testState.stepDescriptions != null) {
 			testState.moveToNextStep();
 		}
 	}