Automatic WebDriver downloads are now active by default (to disable, …

…set webdriver.autodownload to false). The @Managed annotation is now only required to specify what driver you want to use for JUnit tests
a-en · Nov 4, 2020 · 51ce106 · 51ce106
1 parent a366dba
commit 51ce106
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/serenity-core/src/main/java/net/serenitybdd/core/Serenity.java b/serenity-core/src/main/java/net/serenitybdd/core/Serenity.java
@@ -186,7 +186,7 @@ public static String getCurrentSessionID() {
         return null;
     }
 
-    protected static WebDriver getDriver() {
+    public static WebDriver getDriver() {
         return getWebdriverManager().getWebdriver();
     }
 

diff --git a/serenity-core/src/main/java/net/serenitybdd/core/pages/PageObject.java b/serenity-core/src/main/java/net/serenitybdd/core/pages/PageObject.java
@@ -2,6 +2,7 @@
 
 import com.google.common.base.Predicate;
 import com.paulhammant.ngwebdriver.NgWebDriver;
+import net.serenitybdd.core.Serenity;
 import net.serenitybdd.core.collect.NewList;
 import net.serenitybdd.core.environment.EnvironmentSpecificConfiguration;
 import net.thucydides.core.ThucydidesSystemProperty;
@@ -282,6 +283,9 @@ private MatchingPageExpressions getMatchingPageExpressions() {
     }
 
     public WebDriver getDriver() {
+        if (driver == null) {
+            driver = Serenity.getDriver();
+        }
         return driver;
     }
 

diff --git a/...ity-core/src/main/java/net/serenitybdd/core/webdriver/driverproviders/DriverProvider.java b/...ity-core/src/main/java/net/serenitybdd/core/webdriver/driverproviders/DriverProvider.java
@@ -21,7 +21,6 @@ default Properties capabilitiesToProperties(Capabilities capabilities) {
     }
 
     default boolean isDriverAutomaticallyDownloaded(EnvironmentVariables environmentVariables) {
-        String webDriverAutodownload = ThucydidesSystemProperty.WEBDRIVER_AUTODOWNLOAD.from(environmentVariables);
-        return( webDriverAutodownload != null && webDriverAutodownload.toLowerCase().equals("true"));
+        return ThucydidesSystemProperty.WEBDRIVER_AUTODOWNLOAD.booleanFrom(environmentVariables, true);
     }
 }
diff --git a/serenity-report-resources/src/main/resources/freemarker/text-summary.ftl b/serenity-report-resources/src/main/resources/freemarker/text-summary.ftl
@@ -2,7 +2,6 @@ Serenity report generated ${timestamp}
 ${testOutcomes.totalTestScenarios} test scenarios <#if (testOutcomes.hasDataDrivenTests())>(${testOutcomes.total} tests in all, including ${testOutcomes.totalDataRows} rows of test data)</#if>
 
 Passed:             ${testOutcomes.totalScenarios.withResult("success")}
-Pending             ${testOutcomes.totalScenarios.withResult("pending")}
 Failed:             ${testOutcomes.totalScenarios.withResult("failure")}
 Failed with errors: ${testOutcomes.totalScenarios.withResult("error")}
 Compromised:        ${testOutcomes.totalScenarios.withResult("compromised")}