Merge 018bd48 into ab5ce21

valfirst · Jun 25, 2018 · 2b970df · 2b970df
2 parents ab5ce21 + 018bd48
commit 2b970df
Show file tree

Hide file tree

Showing 2 changed files with 21 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();
 		}
 	}

diff --git a/src/test/java/com/github/valfirst/jbehave/junit/monitoring/JUnitScenarioReporterTest.java b/src/test/java/com/github/valfirst/jbehave/junit/monitoring/JUnitScenarioReporterTest.java
@@ -4,6 +4,7 @@
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import java.util.Collections;
 
@@ -246,6 +247,16 @@ public void shouldNotifyAboutLifecycleStorySteps() {
 		verifyStoryFinished();
 	}
 
+	@Test
+	public void shouldNotNotifySubStepWithoutBeforeAction() {
+		scenarioDescription.addChild(Description.TEST_MECHANISM);
+
+		reporter = new JUnitScenarioReporter(notifier, 1, rootDescription, keywords);
+
+		reportStepSuccess(reporter);
+		verifyZeroInteractions(notifier);
+	}
+
 	@Test
 	public void shouldNotifyGivenStory() {