Merge pull request serenity-bdd#1389 from miles-mason/master

fix: Treat subclasses of an Ability as the superclass Ability
tvrulesme · Oct 3, 2018 · f92fff9 · f92fff9
2 parents 7bab324 + 5d8cc20
commit f92fff9
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/serenity-screenplay/src/main/java/net/serenitybdd/screenplay/Actor.java b/serenity-screenplay/src/main/java/net/serenitybdd/screenplay/Actor.java
@@ -83,7 +83,20 @@ public <T extends Ability> Actor whoCan(T doSomething) {
 
     @SuppressWarnings("unchecked")
     public <T extends Ability> T abilityTo(Class<? extends T> doSomething) {
-        return (T) abilities.get(doSomething);
+        T ability = (T) abilities.get(doSomething);
+
+        if (ability == null) {
+            // See if any ability is a subclass of doSomething
+            for (Map.Entry<Class, Ability> entry: abilities.entrySet()) {
+                // Return the first subclass we find
+                if (doSomething.isAssignableFrom(entry.getKey())) {
+                    ability = (T) entry.getValue();
+                    break;
+                }
+            }
+        }
+
+        return ability;
     }
 
     /**

diff --git a/...nity-screenplay/src/test/groovy/net/serenitybdd/screenplay/WhenActorsHaveAbilities.groovy b/...nity-screenplay/src/test/groovy/net/serenitybdd/screenplay/WhenActorsHaveAbilities.groovy
@@ -16,6 +16,8 @@ class WhenActorsHaveAbilities extends Specification{
         }
     }
 
+    class ReachEnlightenment extends Meditate {}
+
     def "actors can be associated with Abilities"() {
         given:
         def actor = Actor.named("Bruce")
@@ -38,4 +40,15 @@ class WhenActorsHaveAbilities extends Specification{
 
     }
 
+    def "actors associate extensions of Abilities with the superclass too"() {
+        given:
+        def actor = Actor.named("Bruce")
+        def reachEnlightenment = new ReachEnlightenment()
+        when:
+        actor.can(reachEnlightenment)
+        then:
+        actor.abilityTo(Meditate) instanceof ReachEnlightenment
+
+    }
+
 }