Merge pull request #220 from YamStranger/218_issue

218 issue

serenity-junit/src/test/java/net/serenitybdd/junit/runners/integration/WhenRunningATestScenarioWithScreenshots.java

@@ -2,10 +2,13 @@
 
 import net.serenitybdd.junit.runners.SerenityRunner;
 import net.thucydides.core.model.TestOutcome;
+import net.thucydides.core.model.TestResult;
 import net.thucydides.junit.rules.DisableThucydidesHistoryRule;
 import net.thucydides.junit.rules.QuietThucydidesLoggingRule;
 import net.thucydides.junit.runners.AbstractTestStepRunnerTest;
+import net.thucydides.samples.LongSamplePassingScenarioUsingHTMLUnit;
 import net.thucydides.samples.LongSamplePassingScenarioUsingPhantomJS;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.notification.RunNotifier;
@@ -26,7 +29,7 @@ public class WhenRunningATestScenarioWithScreenshots extends AbstractTestStepRun
     public DisableThucydidesHistoryRule disableThucydidesHistoryRule = new DisableThucydidesHistoryRule();
 
     @Test
-    public void the_test_runner_records_the_steps_as_they_are_executed() throws InitializationError {
+    public void the_test_runner_records_the_steps_as_they_are_executed_with_phantom_js() throws InitializationError {
 
         SerenityRunner runner = new SerenityRunner(LongSamplePassingScenarioUsingPhantomJS.class);
         runner.run(new RunNotifier());
@@ -39,6 +42,23 @@ public void the_test_runner_records_the_steps_as_they_are_executed() throws Init
         assertThat(testOutcome1.getName(), is("happy_day_scenario"));
         assertThat(testOutcome1.getTestSteps().size(), is(3));
         assertThat(testOutcome1.getScreenshots().size(), is(not(0)));
+        assertThat(testOutcome1.getResult(), is(TestResult.SUCCESS));
     }
 
+    @Test
+    @Ignore
+    public void the_test_runner_records_the_steps_as_they_are_executed_with_html_unit() throws InitializationError {
+        SerenityRunner runner = new SerenityRunner(LongSamplePassingScenarioUsingHTMLUnit.class);
+        runner.run(new RunNotifier());
+
+        List<TestOutcome> executedSteps = runner.getTestOutcomes();
+        assertThat(executedSteps.size(), is(1));
+        TestOutcome testOutcome1 = executedSteps.get(0);
+
+        assertThat(testOutcome1.getTitle(), is("Happy day scenario"));
+        assertThat(testOutcome1.getName(), is("happy_day_scenario"));
+        assertThat(testOutcome1.getTestSteps().size(), is(3));
+        assertThat(testOutcome1.getScreenshots().size(), is(0));
+        assertThat(testOutcome1.getResult(), is(TestResult.SUCCESS));
+    }
 }

serenity-junit/src/test/java/net/thucydides/samples/LongSamplePassingScenarioUsingHTMLUnit.java

@@ -0,0 +1,31 @@
+package net.thucydides.samples;
+
+import net.serenitybdd.junit.runners.SerenityRunner;
+import net.thucydides.core.annotations.Managed;
+import net.thucydides.core.annotations.ManagedPages;
+import net.thucydides.core.annotations.Screenshots;
+import net.thucydides.core.annotations.Steps;
+import net.thucydides.core.pages.Pages;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.openqa.selenium.WebDriver;
+
+@RunWith(SerenityRunner.class)
+public class LongSamplePassingScenarioUsingHTMLUnit {
+
+    @Managed(uniqueSession = true, driver="htmlunit")
+    public WebDriver webdriver;
+
+    @ManagedPages(defaultUrl = "http://www.wikipedia.org")
+    public Pages pages;
+
+    @Steps
+    public SampleScenarioSteps steps;
+
+    @Test
+    public void happy_day_scenario() throws Throwable {
+        steps.stepThatUsesABrowser();
+        steps.anotherStepThatUsesABrowser();
+        steps.aStepThatAlsoUsesABrowser();
+    }
+}

serenity-junit/src/test/java/net/thucydides/samples/LongSamplePassingScenarioUsingPhantomJS.java

@@ -1,5 +1,6 @@
 package net.thucydides.samples;
 
+import net.serenitybdd.junit.runners.SerenityRunner;
 import net.thucydides.core.annotations.Managed;
 import net.thucydides.core.annotations.ManagedPages;
 import net.thucydides.core.annotations.Steps;
@@ -9,15 +10,15 @@
 import org.junit.runner.RunWith;
 import org.openqa.selenium.WebDriver;
 
-@RunWith(ThucydidesRunner.class)
+@RunWith(SerenityRunner.class)
 public class LongSamplePassingScenarioUsingPhantomJS {
-    
+
     @Managed(uniqueSession = true, driver="phantomjs")
     public WebDriver webdriver;
 
     @ManagedPages(defaultUrl = "classpath:static-site/index.html")
     public Pages pages;
-    
+
     @Steps
     public SampleScenarioSteps steps;