Fixed a bug that incorrectly reported a failing test if another test …

…had previously failed

pom.xml

@@ -51,5 +51,10 @@
             <version>0.3b</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit-dep</artifactId>
+            <version>4.10</version>
+        </dependency>
     </dependencies>
 </project>

src/main/java/net/thucydides/jbehave/ThucydidesJUnitStories.java

@@ -2,17 +2,17 @@
 
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
-import net.thucydides.core.ThucydidesSystemProperties;
 import net.thucydides.core.ThucydidesSystemProperty;
 import net.thucydides.core.guice.Injectors;
 import net.thucydides.core.webdriver.ThucydidesWebDriverSupport;
-import org.apache.log4j.net.SMTPAppender;
 import org.codehaus.plexus.util.StringUtils;
+import org.jbehave.core.ConfigurableEmbedder;
 import org.jbehave.core.configuration.Configuration;
+import org.jbehave.core.embedder.Embedder;
 import org.jbehave.core.io.StoryFinder;
-import org.jbehave.core.junit.JUnitStories;
 import org.jbehave.core.reporters.Format;
 import org.jbehave.core.steps.InjectableStepsFactory;
+import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.List;
@@ -27,7 +27,7 @@
  * By default, it will look for *.story files on the classpath, and steps in or underneath the current package.
  * You can redefine these constraints as follows:
  */
-public abstract class ThucydidesJUnitStories extends JUnitStories {
+public class ThucydidesJUnitStories extends ConfigurableEmbedder {
 
     public static final String DEFAULT_STORY_NAME =  "**/*.story";
 
@@ -39,6 +39,17 @@ public abstract class ThucydidesJUnitStories extends JUnitStories {
     private Configuration configuration;
     private List<Format> formats = Arrays.asList(CONSOLE, HTML, XML);
 
+    @Test
+    public void run() throws Throwable {
+        Embedder embedder = configuredEmbedder();
+        embedder.embedderControls().doIgnoreFailureInView(true);
+        try {
+            embedder.runStoriesAsPaths(storyPaths());
+        } finally {
+            embedder.generateCrossReference();
+        }
+    }
+
     @Override
     public Configuration configuration() {
         if (configuration == null) {
@@ -52,7 +63,6 @@ public InjectableStepsFactory stepsFactory() {
         return ThucydidesStepFactory.withStepsFromPackage(getRootPackage(), formats);
     }
 
-    @Override
     protected List<String> storyPaths() {
         List<String> storyPaths = Lists.newArrayList();
 

src/main/java/net/thucydides/jbehave/ThucydidesJUnitStory.java

@@ -1,6 +1,8 @@
 package net.thucydides.jbehave;
 
 import net.thucydides.core.util.Inflector;
+import org.codehaus.plexus.util.StringUtils;
+import org.jbehave.core.embedder.Embedder;
 
 /**
  * Run an individual JBehave story in JUnit, where the name of the story is derived from the name of the test.
@@ -13,17 +15,21 @@ public ThucydidesJUnitStory() {
 
     @Override
     public void run() throws Throwable {
-        super.run();    //To change body of overridden methods use File | Settings | File Templates.
+        super.run();
     }
 
     protected String storynamesDerivedFromClassName() {
-        return camelCaseStoryName() + ";" + underscoreStoryName();
+        return camelCaseStoryName() + ";" + underscoreStoryName() + ";" + camelCaseStartingWithLowercaseStoryName();
     }
 
     private String camelCaseStoryName() {
         return "**/" + simpleClassName() + ".story";
     }
 
+    private String camelCaseStartingWithLowercaseStoryName() {
+        return "**/" + StringUtils.uncapitalise(simpleClassName())  + ".story";
+    }
+
     private String simpleClassName() {
         return this.getClass().getSimpleName();
     }

src/test/java/net/thucydides/jbehave/AFailingBehavior.java

@@ -0,0 +1,4 @@
+package net.thucydides.jbehave;
+
+public class AFailingBehavior extends ThucydidesJUnitStory {
+}