3522: undoing Formatter changes to keep tests green and doing everyth…

…ing "inside" ftl
serenity-bdd · Sep 5, 2024 · 9489abf · 9489abf
1 parent b29568d
commit 9489abf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/serenity-report-resources/src/main/resources/freemarker/default.ftl b/serenity-report-resources/src/main/resources/freemarker/default.ftl
@@ -38,11 +38,14 @@
         <#list breadcrumbs as breadcrumb>
             <#assign breadcrumbReport = absoluteReportName.forRequirement(breadcrumb) />
             <#assign breadcrumbTitle = breadcrumb.displayName > <!-- inflection.of(breadcrumb.displayName).asATitle()-->
-            > <a href="${breadcrumbReport}">${formatter.htmlCompatibleStoryTitle(breadcrumbTitle)}</a>
+            > <a href="${breadcrumbReport}">
+            ${formatter.escapeHtmlTags(formatter.htmlCompatibleStoryTitle(breadcrumbTitle))}
+        </a>
         </#list>
 <#--        > ${formatter.htmlCompatibleTestTitle(formatter.renderTitle(testOutcome.title))}-->
 <#--        > ${formatter.htmlCompatibleTestTitle(testOutcome.title)}-->
-        > ${formatter.htmlCompatibleTestTitle(formatter.humanReadableFormOf(testOutcome.title))}
+        >
+            ${formatter.escapeHtmlTags(formatter.htmlCompatibleTestTitle(formatter.humanReadableFormOf(testOutcome.title)))}
         </span>
         </div>
         <div class="rightbg"></div>
@@ -346,7 +349,7 @@
                                 <#assign roeResult = row.result/>
                             </#if>
                             <td class="test-${roeResult}"><a
-                                        href="#${rowIndex}">${formatter.plainHtmlCompatible(value)}</a>
+                                        href="#${rowIndex}"><#outputformat 'HTML'>${formatter.plainHtmlCompatible(value)}</#outputformat></a>
                             </td>
                         </#list>
                     </tr>

diff --git a/serenity-report-resources/src/main/resources/freemarker/junit5/default.ftl b/serenity-report-resources/src/main/resources/freemarker/junit5/default.ftl
@@ -338,7 +338,7 @@
                                     <#assign roeResult = row.result/>
                                 </#if>
                                 <td class="test-${roeResult}"><a
-                                            href="#${rowIndex}">${formatter.plainHtmlCompatible(value)}</a>
+                                            href="#${rowIndex}"><#outputformat 'HTML'>${formatter.plainHtmlCompatible(value)}</#outputformat></a>
                                 </td>
                             </#list>
                         </tr>

diff --git a/serenity-reports/src/main/java/net/thucydides/core/reports/html/Formatter.java b/serenity-reports/src/main/java/net/thucydides/core/reports/html/Formatter.java
@@ -437,8 +437,7 @@ private String newLineUsedIn(String text) {
 
     private static final CharSequenceTranslator ESCAPE_SPECIAL_CHARS = new AggregateTranslator(
             new LookupTranslator(EntityArrays.ISO8859_1_ESCAPE()),
-            new LookupTranslator(EntityArrays.HTML40_EXTENDED_ESCAPE()),
-            new LookupTranslator(new String[][] { {"<", "&lt;"}, {">", "&gt;"}})
+            new LookupTranslator(EntityArrays.HTML40_EXTENDED_ESCAPE())
     );
 
     private final CharSequenceTranslator BASIC_XML = new AggregateTranslator(
@@ -481,6 +480,10 @@ public String htmlCompatibleStoryTitle(Object fieldValue) {
                 (htmlCompatible(renderMarkdownWithoutTags(firstLine))) : htmlCompatible(firstLine);
     }
 
+    public String escapeHtmlTags(String fieldValue) {
+        return fieldValue.replace("<", "&lt;").replace(">", "&gt;");
+    }
+
     public String htmlCompatibleTestTitle(Object fieldValue) {
         String firstLine = fieldValue.toString().split("\\n")[0];