[allure-adaptor] Include know-issues in pass rate

vividus-framework · Apr 22, 2024 · e9d4a62 · e9d4a62
1 parent 6b39d01
commit e9d4a62
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/vividus-allure-adaptor/src/main/java/org/vividus/report/allure/AllureReportGenerator.java b/vividus-allure-adaptor/src/main/java/org/vividus/report/allure/AllureReportGenerator.java
@@ -306,13 +306,21 @@ private void patchAllureFiles() throws IOException
         String cssString = FileUtils.readFileToString(cssFile, StandardCharsets.UTF_8);
 
         String brokenStatusColor = "#d35ebf";
+        String passRateCounterScript =
+                "var e=this.statistic,t=e.passed,n=void 0===t?0:t,r=e.failed,a=void 0===r?0:r,i=e.broken,o=void "
+                + "0===i?0:i,s=e.total;return(void 0===s?0:s)?n?\"\""
+                + ".concat(this.formatNumber(n/(n+a+o)*100),\"%\"):\"0%\":\"???\"";
         javascriptString = javascriptString
                 // Replacing of gray colors with #d35ebf in CSS does not affect the color used to draw
                 // <rect> HTML elements used to display trends
                 .replace("#aaa", brokenStatusColor)
                 .replace("\"unknown\":\"Unknown\"", "\"unknown\":\"Known\"")
                 .replace("\"failed\",\"broken\",\"passed\",\"skipped\",\"unknown\"",
-                        "\"failed\",\"unknown\",\"passed\",\"broken\",\"skipped\"");
+                        "\"failed\",\"unknown\",\"passed\",\"broken\",\"skipped\"")
+                .replace(passRateCounterScript,
+                        "var e=this.statistic,t=e.passed,n=void 0===t?0:t,r=e.failed,a=void 0===r?0:r,i=e.broken,o=void"
+                                + " 0===i?0:i,c=e.unknown,d=void 0===c?0:c,s=e.total;return(void 0===s?0:s)?n?\"\""
+                                + ".concat(this.formatNumber((n+d)/(n+d+a+o)*100),\"%\"):\"0%\":\"???\"");
         cssString = cssString
                 .replace("#ffd050", brokenStatusColor)
                 .replace("#d35ebe", "#ffd051")

diff --git a/...src/test/java/org/vividus/report/allure/adapter/AllureReportPatchingConsistencyTests.java b/...src/test/java/org/vividus/report/allure/adapter/AllureReportPatchingConsistencyTests.java
@@ -39,6 +39,10 @@ static Stream<Arguments> allureSourceContainsText()
         return Stream.of(
                 Arguments.of(APP_JS, "\"unknown\":\"Unknown\""),
                 Arguments.of(APP_JS, "\"failed\",\"broken\",\"passed\",\"skipped\",\"unknown\""),
+                Arguments.of(APP_JS,
+                        "var e=this.statistic,t=e.passed,n=void 0===t?0:t,r=e.failed,a=void 0===r?0:r,i=e.broken,o=void"
+                                + " 0===i?0:i,s=e.total;return(void 0===s?0:s)?n?\"\""
+                                + ".concat(this.formatNumber(n/(n+a+o)*100),\"%\"):\"0%\":\"???\""),
                 Arguments.of(STYLES_CSS, "#ffd050"),
                 Arguments.of(STYLES_CSS, "#d35ebe"),
                 Arguments.of(STYLES_CSS, "#fffae6"),