Merged in PR serenity-bdd#1638

andreasgebauer · Jun 6, 2019 · b04c2c3 · b04c2c3
1 parent 9d7f7a7
commit b04c2c3
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/serenity-core/src/main/java/net/serenitybdd/core/pages/PageUrls.java b/serenity-core/src/main/java/net/serenitybdd/core/pages/PageUrls.java
@@ -173,12 +173,13 @@ public String getNamedUrl(final String name,
     private String urlWithParametersSubstituted(final String template,
                                                 final String[] parameterValues) {
 
-        String url = template;
+        String url = addBaseUrlTo(template);
         for (int i = 0; i < parameterValues.length; i++) {
             String variable = String.format("{%d}", i + 1);
             url = url.replace(variable, parameterValues[i]);
         }
-        return addBaseUrlTo(url);
+//        return addBaseUrlTo(url);
+        return url;
     }
 
 

diff --git a/...odel/src/main/java/net/serenitybdd/core/environment/EnvironmentSpecificConfiguration.java b/...odel/src/main/java/net/serenitybdd/core/environment/EnvironmentSpecificConfiguration.java
@@ -75,12 +75,13 @@ public String getProperty(String propertyName) {
         return substituteProperties(propertyValue);
     }
 
-    private final Pattern VARIABLE_EXPRRESSION_PATTERN = Pattern.compile("#\\{(.*)\\}");
+    //private final Pattern VARIABLE_EXPRRESSION_PATTERN = Pattern.compile("#\\{(.*)\\}");
+    private final Pattern VARIABLE_EXPRESSION_PATTERN = Pattern.compile("#\\{([^}]*)\\}");
 
     private String substituteProperties(String propertyValue) {
         if (propertyValue == null) { return propertyValue; }
 
-        Matcher matcher = VARIABLE_EXPRRESSION_PATTERN.matcher(propertyValue);
+        Matcher matcher = VARIABLE_EXPRESSION_PATTERN.matcher(propertyValue);
         while (matcher.find()) {
             String nestedProperty = matcher.group().substring(2,matcher.group().length() - 1);
             String value = getPropertyValue(nestedProperty);

diff --git a/serenity-model/src/main/java/net/thucydides/core/reports/TestOutcomes.java b/serenity-model/src/main/java/net/thucydides/core/reports/TestOutcomes.java
@@ -400,6 +400,12 @@ public boolean containsTag(TestTag testTag) {
         return getTags().contains(testTag);
     }
 
+    public boolean containsTagMatching(TestTag containedTag) {
+        return getTags().stream().anyMatch(
+                tag -> tag.isAsOrMoreSpecificThan(containedTag) || containedTag.isAsOrMoreSpecificThan(tag)
+        );
+    }
+
     public Optional<ZonedDateTime> getStartTime() {
         return outcomes.stream()
                 .filter(outcome -> outcome.getStartTime() != null)

diff --git a/...ty-model/src/main/java/net/thucydides/core/requirements/reports/RequirementsOutcomes.java b/...ty-model/src/main/java/net/thucydides/core/requirements/reports/RequirementsOutcomes.java
@@ -389,7 +389,7 @@ public List<RequirementOutcome> geLeafRequirementOutcomes(List<RequirementOutcom
     }
 
     public List<RequirementOutcome> getFlattenedRequirementOutcomes(List<RequirementOutcome> outcomes) {
-        Set<RequirementOutcome> flattenedOutcomes = new HashSet();
+        Set<RequirementOutcome> flattenedOutcomes = new HashSet<>();
 
         for (RequirementOutcome requirementOutcome : outcomes) {
             flattenedOutcomes.add(requirementOutcome);

diff --git a/serenity-reports/src/main/java/net/thucydides/core/reports/html/FreemarkerContext.java b/serenity-reports/src/main/java/net/thucydides/core/reports/html/FreemarkerContext.java
@@ -15,6 +15,7 @@
 import net.thucydides.core.reports.ReportOptions;
 import net.thucydides.core.reports.TestOutcomes;
 import net.thucydides.core.requirements.RequirementsService;
+import net.thucydides.core.requirements.reports.RequirementsOutcomes;
 import net.thucydides.core.requirements.reports.ScenarioOutcome;
 import net.thucydides.core.requirements.reports.ScenarioOutcomes;
 import net.thucydides.core.util.EnvironmentVariables;
@@ -123,10 +124,14 @@ public Map<String, Object> getBuildContext(TestOutcomes testOutcomes,
 
         context.put("inflection", Inflector.getInstance());
 
-        Collection<TestTag> coveredTags = requirements.getTagsOfType(tagTypes);
+        Collection<TestTag> coveredTags = requirements.getTagsOfType(tagTypes).stream()
+                .filter(tag -> testOutcomes.containsTagMatching(tag))
+                .collect(Collectors.toSet());
 
-        context.put("coverage", TagCoverage.from(testOutcomes)//.withTags(coveredTags))
-                .showingTags(requirements.getTagsOfType(tagTypes))
+
+        context.put("coverage", TagCoverage.from(testOutcomes)
+//                .showingTags(requirements.getTagsOfType(tagTypes))
+                .showingTags(coveredTags)
                 .forTagTypes(tagTypes));
         context.put("backgroundColor", new BackgroundColor());