Fixed an issue where the @Managed driver assigned to an actor was ove…

…rrided by the default driver.
theovandijk · Dec 19, 2017 · 6da7305 · 6da7305
1 parent 4751c9d
commit 6da7305
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...nity-screenplay-webdriver/src/main/java/net/serenitybdd/screenplay/actors/OnlineCast.java b/...nity-screenplay-webdriver/src/main/java/net/serenitybdd/screenplay/actors/OnlineCast.java
@@ -13,8 +13,12 @@ public class OnlineCast extends Cast {
 
     @Override
     public Actor actorNamed(String actorName, Ability... abilities) {
+
         Actor newActor = super.actorNamed(actorName, abilities);
-        return newActor.can(BrowseTheWeb.with(theDefaulteBrowserFor(actorName)));
+        if (newActor.abilityTo(BrowseTheWeb.class) == null) {
+            newActor.can(BrowseTheWeb.with(theDefaulteBrowserFor(actorName)));
+        }
+        return newActor;
     }
 
     public BrowsingActorBuilder actorUsingBrowser(String driver) {

diff --git a/serenity-screenplay/src/main/java/net/serenitybdd/screenplay/actors/Stage.java b/serenity-screenplay/src/main/java/net/serenitybdd/screenplay/actors/Stage.java
@@ -21,7 +21,7 @@ public Actor shineSpotlightOn(String actorName) {
                                          .filter(actor -> actor.getName().equalsIgnoreCase(actorName))
                                          .findFirst();
 
-        actorInTheSpotlight = knownActor.orElse(cast.actorNamed(actorName));;
+        actorInTheSpotlight = knownActor.orElseGet(() -> cast.actorNamed(actorName));
         return theActorInTheSpotlight();
     }