Merge pull request serenity-bdd#2016 from cliviu/master

support for cucumber.filter.tags

Author: wakaleo

serenity-model/src/main/java/net/thucydides/core/reports/html/CucumberCompatibleFilter.java

@@ -34,20 +34,28 @@ protected Expression cucumberTagExpressionUsing(ThucydidesSystemProperty tagProp
     }
 
     protected Optional<String> cucumberTagOptions() {
+        String cucumberFilterTags = environmentVariables.getProperty("cucumber.filter.tags");
+        if (StringUtils.isNotEmpty(cucumberFilterTags)) {
+            return Optional.of(StringUtils.strip(cucumberFilterTags, "'"));
+        }
         String cucumberOptions = environmentVariables.getProperty("cucumber.options");
         if (StringUtils.isNotEmpty(cucumberOptions) && (cucumberOptions.contains("--tags "))) {
-            int tagsFlag = cucumberOptions.indexOf("--tags ");
-            int tagsOptionStart = tagsFlag + 7;
-            int nextTagOptionStart = cucumberOptions.indexOf("--", tagsOptionStart);
-            String tagOption = (nextTagOptionStart > 0) ?
-                    cucumberOptions.substring(tagsOptionStart, nextTagOptionStart) : cucumberOptions.substring(tagsOptionStart);
-
-            String tagOptionsWithoutAtSigns = StringUtils.strip(tagOption, "'");
-            return Optional.of(tagOptionsWithoutAtSigns);
+            return getTagsFromCucumberOptions(cucumberOptions);
         }
         return Optional.empty();
     }
 
+    private Optional<String> getTagsFromCucumberOptions(String cucumberOptions) {
+        int tagsFlag = cucumberOptions.indexOf("--tags ");
+        int tagsOptionStart = tagsFlag + 7;
+        int nextTagOptionStart = cucumberOptions.indexOf("--", tagsOptionStart);
+        String tagOption = (nextTagOptionStart > 0) ?
+                cucumberOptions.substring(tagsOptionStart, nextTagOptionStart) : cucumberOptions.substring(tagsOptionStart);
+
+        String tagOptionsWithoutAtSigns = StringUtils.strip(tagOption, "'");
+        return Optional.of(tagOptionsWithoutAtSigns);
+    }
+
     public boolean matchesTags(List<TestTag> testTags) {
         Expression expectedTags = cucumberTagExpressionUsing(TAGS);
 

serenity-model/src/main/java/net/thucydides/core/reports/html/RequirementsFilter.java

@@ -1,13 +1,11 @@
 package net.thucydides.core.reports.html;
 
 import io.cucumber.tagexpressions.Expression;
-import io.cucumber.tagexpressions.TagExpressionParser;
-import net.thucydides.core.ThucydidesSystemProperty;
-import net.thucydides.core.model.TestTag;
 import net.thucydides.core.requirements.model.Requirement;
 import net.thucydides.core.util.EnvironmentVariables;
 
 import java.util.List;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import static net.thucydides.core.ThucydidesSystemProperty.TAGS;
@@ -25,12 +23,9 @@ public boolean inDisplayOnlyTags(Requirement requirement) {
 
 
     private boolean requirementMatchesAnyTagIn(Requirement requirement, Expression expectedTags) {
-        List<String> requirementTags = CucumberTagConverter.toStrings(requirement.getTags());
-
-        if (expectedTags.evaluate(requirementTags) || (matchExistsInScenarios(expectedTags, requirement))) {
+        if (new RequirementTagMatcher(expectedTags).test(requirement)) {
             return true;
         }
-
         return hasChildWithMatchingTag(requirement, expectedTags);
     }
 
@@ -44,12 +39,25 @@ private boolean hasChildWithMatchingTag(Requirement requirement, Expression expe
         if (!requirement.hasChildren()) {
             return false;
         }
-        return requirement.getNestedChildren().stream().anyMatch(
-                child -> expectedTags.evaluate(CucumberTagConverter.toStrings(child.getTags()))
-        );
+        return requirement.getNestedChildren().stream().anyMatch(new RequirementTagMatcher(expectedTags));
+    }
+
+    private class RequirementTagMatcher implements Predicate<Requirement> {
+
+        private Expression expectedTags;
+
+        public RequirementTagMatcher(Expression expectedTags) {
+            this.expectedTags = expectedTags;
+        }
+
+        @Override
+        public boolean test(Requirement requirement) {
+            return expectedTags.evaluate(CucumberTagConverter.toStrings(requirement.getTags())) ||  matchExistsInScenarios(expectedTags, requirement);
+        }
     }
 
 
+
     public List<Requirement> filteredByDisplayTag(List<Requirement> requirements) {
         return requirements.stream()
                 .filter(this::inDisplayOnlyTags)