Unit test fix

globalworming · Apr 19, 2019 · e289885 · e289885
1 parent 590d4a6
commit e289885
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/serenity-core/src/main/java/net/thucydides/core/webdriver/CapabilityEnhancer.java b/serenity-core/src/main/java/net/thucydides/core/webdriver/CapabilityEnhancer.java
@@ -37,11 +37,12 @@ public DesiredCapabilities enhanced(DesiredCapabilities capabilities, SupportedW
         AddEnvironmentSpecifiedDriverCapabilities.from(environmentVariables).forDriver(driver).to(capabilities);
 
         if (StepEventBus.getEventBus() != null && StepEventBus.getEventBus().isBaseStepListenerRegistered()) {
-            TestOutcome currentTestOutcome = StepEventBus.getEventBus()
+            Optional<TestOutcome> currentTestOutcome = StepEventBus.getEventBus()
                                                          .getBaseStepListener()
-                                                         .latestTestOutcome()
-                                                         .orElse(null);
-            AddCustomDriverCapabilities.from(environmentVariables).withTestDetails(driver, currentTestOutcome).to(capabilities);
+                                                         .latestTestOutcome();
+
+            TestOutcome outcome = (currentTestOutcome == null) ? null : currentTestOutcome.get();
+            AddCustomDriverCapabilities.from(environmentVariables).withTestDetails(driver, outcome).to(capabilities);
         }
 
         return capabilities;