Skip to content

Commit b665ead

Browse files
authored
Fix id conversion in ftl templates (#413)
1 parent 0b134ae commit b665ead

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

src/main/resources/com/aventstack/extentreports/markup/codeblock.json.ftl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<#setting number_format="0">
12
<#list code as c>
23
<div class='json-tree' id='code-block-json-${index}'></div>
34
<script>

src/main/resources/com/aventstack/extentreports/templates/spark/macros/attr-common.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<td><span class="badge log ${test.status.toLower()}-bg">${test.status?string}</span></td>
4444
<td>${test.startTime?string[("HH:mm:ss a")]}</td>
4545
<td>
46-
<a href="#" class="linked" test-id='${test.getAncestor().getId()}' id='${test.getId()}'>${test.name}</a>
46+
<a href="#" class="linked" test-id='${test.getAncestor().getId()?string["0"]}' id='${test.getId()?string["0"]}'>${test.name}</a>
4747
<#if test.parent??>
4848
<div class="">
4949
<span class="badge badge-default">${test.getFullName()}</span>

src/main/resources/com/aventstack/extentreports/templates/spark/macros/recurse_nodes.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</ul>
1414
</div>
1515
<div class="card-title">
16-
<a class="node <#if !node.hasChildren() && node.status=='FAIL'>collapsed</#if>" id="${node.getId()}"><span>${node.name}</span></a>
16+
<a class="node <#if !node.hasChildren() && node.status=='FAIL'>collapsed</#if>" id="${node.getId()?string["0"]}"><span>${node.name}</span></a>
1717
<div class="node-attr">
1818
<#if node.hasAttributes()><@attributes test=node /></#if>
1919
</div>

src/main/resources/com/aventstack/extentreports/templates/spark/partials/bdd-content.ftl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<div class="card">
1616
<div class="card-header" role="tab">
1717
<div class="card-title">
18-
<div class="node" id="${node.getId()}"><span class="badge log ${node.status.toLower()}-bg mr-2">${node.status?string}</span>${node.name}</div>
18+
<div class="node" id="${node.getId()?string["0"]}"><span class="badge log ${node.status.toLower()}-bg mr-2">${node.status?string}</span>${node.name}</div>
1919
<#if TestService.testHasScreenCapture(node, true)>
2020
<div class="status-avatar float-right mr-4">
2121
<i class="fa fa-paperclip"></i>
@@ -30,7 +30,7 @@
3030
<div class="card-body l1">
3131
<div class="card-header">
3232
<div class="card-title outline-child">
33-
<div class="node" id="${child.getId()}"><span class="badge log ${child.status.toLower()}-bg mr-2">${child.status?string}</span>${child.name}</div>
33+
<div class="node" id="${child.getId()?string["0"]}"><span class="badge log ${child.status.toLower()}-bg mr-2">${child.status?string}</span>${child.name}</div>
3434
<#if TestService.testHasScreenCapture(child, true)>
3535
<div class="status-avatar float-right">
3636
<i class="fa fa-paperclip"></i>

src/main/resources/com/aventstack/extentreports/templates/spark/partials/test.ftl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<div class="test-list-wrapper scrollable">
5050
<ul class="test-list-item">
5151
<#list report.testList as test>
52-
<li class="test-item" status="${test.status.toLower()}" test-id="${test.getId()}"
52+
<li class="test-item" status="${test.status.toLower()}" test-id="${test.getId()?string["0"]}"
5353
author="<#list test.authorSet as x>${x.name}<#if x_has_next> </#if></#list>"
5454
tag="<#list test.categorySet as x>${x.name}<#if x_has_next> </#if></#list>"
5555
device="<#list test.deviceSet as x>${x.name}<#if x_has_next> </#if></#list>">
@@ -69,7 +69,7 @@
6969
<span class='badge badge-success'>${test.startTime?string("MM.dd.yyyy")} ${test.startTime?time?string}</span>
7070
<span class='badge badge-danger'>${test.endTime?string("MM.dd.yyyy")} ${test.endTime?time?string}</span>
7171
<span class='badge badge-default'>${test.timeTakenPretty()}</span>
72-
&middot; <span class='uri-anchor badge badge-default'>#test-id=${test.getId()}</span>
72+
&middot; <span class='uri-anchor badge badge-default'>#test-id=${test.getId()?string["0"]}</span>
7373
<span title='Skip to the next failed step' class='badge badge-danger pointer float-right ne ml-1'><i class="fa fa-fast-forward"></i></span>
7474
<span title='Collapse all nodes' class='badge badge-default pointer float-right ct ml-1'><i class="fa fa-compress"></i></span>
7575
<span title='Expand all nodes' class='badge badge-default pointer float-right et'><i class="fa fa-expand"></i></span>

0 commit comments

Comments
 (0)