Skip to content

Commit d9d1413

Browse files
Zyndrictimja
andauthored
Show message of skipped results (#1219) (#1221)
Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com> Co-authored-by: Zyndric <zyndric@users.noreply.github.com>
1 parent a87fd3d commit d9d1413

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

src/main/resources/hudson/tasks/junit/CaseResult/test-output.jelly

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ THE SOFTWARE.
4747
</d:taglib>
4848

4949
<local:item id="${id}" name="error" title="${%Error Details}" value="${it.errorDetails}" />
50+
<local:item id="${id}" name="skipmessage" title="${%Skip Message}" value="${it.skippedMessage}" />
5051
<j:forEach var="p" items="${it.properties}">
5152
<local:item id="${id}" name="${p.key}" title="${p.key}" value="${p.value}" />
5253
</j:forEach>

src/main/resources/images/symbols/status-skipped.svg

Lines changed: 2 additions & 2 deletions
Loading

src/main/resources/lib/hudson/test/table.jelly

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ THE SOFTWARE.
6363
<j:set var="id" value="${h.htmlAttributeEscape(url)}" />
6464

6565
<j:choose>
66-
<j:when test="${f.status == 'SKIPPED'}">
66+
<j:when test="${f.status == 'SKIPPED' and f.skippedMessage == null || f.skippedMessage.isEmpty()}">
6767
<div class="jp-table-row">
68-
<l:icon src="symbol-status-skipped plugin-junit" />
68+
<l:icon src="${f.iconFileName}" />
6969

7070
${f.name}
7171

@@ -80,7 +80,7 @@ THE SOFTWARE.
8080
</j:when>
8181
<j:otherwise>
8282
<a id="test-${id}-showlink" class="jp-table-row" href="${url}">
83-
<l:icon src="${f.status == 'PASSED' ? 'symbol-status-blue' : 'symbol-status-red'}" />
83+
<l:icon src="${f.iconFileName}" />
8484

8585
${f.name}
8686

0 commit comments

Comments
 (0)