Merge branch 'master' into pr/83

# Conflicts:
#	src/main/java/de/codecentric/jbehave/junit/monitoring/JUnitScenarioReporter.java

.gitignore

@@ -5,3 +5,6 @@ test_output
 /target
 /.project
 /.classpath
+
+.idea
+*.iml

src/main/java/de/codecentric/jbehave/junit/monitoring/JUnitScenarioReporter.java

@@ -46,12 +46,6 @@ public class JUnitScenarioReporter extends NullStoryReporter {
 	private PendingStepStrategy pendingStepStrategy = new PassingUponPendingStep();
 	private Keywords keywords;
 
-	/**
-	 * Use to track whether any scenario in the current story has failed. This
-	 * is useful to indicate a story has failed.
-	 */
-	private boolean anyScenarioFailedInCurrentStory = false;
-
 	private boolean notifyFinished = true;
 
 	public JUnitScenarioReporter(RunNotifier notifier, int totalTests,
@@ -83,7 +77,6 @@ public void beforeStory(Story story, boolean isGivenStory) {
 			givenStoryContext = true;
 
 		} else {
-			anyScenarioFailedInCurrentStory = false;
 			if (testCounter == 0) {
 				notifier.fireTestRunStarted(rootDescription);
 			}
@@ -129,17 +122,7 @@ public void afterStory(boolean isGivenStory) {
 			processBeforeScenario();
 		} else {
 			if (!failedSteps.contains(currentStoryDescription)) {
-				// IntelliJ 13.1 does not propogate a step failure up to the
-				// story level.
-				// When there is a step failure then notify that its story has
-				// also failed.
-				if (anyScenarioFailedInCurrentStory == false) {
-					notifier.fireTestFinished(currentStoryDescription);
-				} else {
-					notifier.fireTestFailure(new Failure(
-							currentStoryDescription, new RuntimeException(
-									"story failed!")));
-				}
+				notifier.fireTestFinished(currentStoryDescription);
 				if (currentStoryDescription.isTest())
 				{
 					testCounter++;
@@ -204,20 +187,7 @@ private Collection<Description> getAllDescendants(
 	public void afterScenario() {
 		logger.info("After Scenario: {}", currentScenario.getDisplayName());
 		if (!givenStoryContext) {
-			// IntelliJ 13.1 does not propogate a step failure up to the
-			// scenario level.
-			// When there is a step failure then notify that its scenario has
-			// also failed.
-			if (failedSteps.size() == 0) {
-				notifier.fireTestFinished(currentScenario);
-			} else {
-				notifier.fireTestFailure(new Failure(currentScenario,
-						new RuntimeException("scenario failed!")));
-				anyScenarioFailedInCurrentStory = true;
-				// TODO: Code review this. Do we really need to keep track of
-				// failed steps between scenarios?
-				failedSteps.clear();
-			}
+			notifier.fireTestFinished(currentScenario);
 			processAfterScenario();
 			moveToNextScenario();
 		}