Fix skipped tests icon and link (#743)

Author: janfaracik

src/main/java/hudson/tasks/junit/CaseResult.java

@@ -49,6 +49,7 @@
 import org.jvnet.localizer.Localizable;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.Beta;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.export.Exported;
 
@@ -1094,4 +1095,13 @@ public boolean isRegression() {
     /*package*/ static final Comparator<CaseResult> BY_AGE = Comparator.comparingInt(CaseResult::getAge);
 
     private static final long serialVersionUID = 1L;
+
+    @Restricted(NoExternalUse.class)
+    public String getIconFileName() {
+        return switch (getStatus()) {
+            case PASSED -> "symbol-checkmark-outline plugin-ionicons-api";
+            case SKIPPED -> "symbol-play-skip-forward-outline plugin-ionicons-api";
+            default -> "symbol-close-outline plugin-ionicons-api";
+        };
+    }
 }

src/main/resources/hudson/tasks/junit/CaseResult/index.jelly

@@ -52,7 +52,7 @@ THE SOFTWARE.
       </div>
       <div class="jp-details">
         <div class="${it.status.cssClass}">
-          <l:icon src="${it.status == 'PASSED' ? 'symbol-checkmark-outline plugin-ionicons-api' : 'symbol-close-outline plugin-ionicons-api'}" />
+          <l:icon src="${it.iconFileName}" />
           ${it.status.message}
         </div>
 

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

@@ -62,21 +62,40 @@ THE SOFTWARE.
                     <j:set var="url" value="${attrs.baseUrl}${f.getRelativePathFrom(attrs.relativeParent ?: it)}" />
                     <j:set var="id" value="${h.htmlAttributeEscape(url)}" />
 
-                    <a id="test-${id}-showlink" class="jp-table-row" href="${url}">
-                        <l:icon src="${f.status == 'PASSED' ? 'symbol-status-blue' : 'symbol-status-red'}" />
+                    <j:choose>
+                        <j:when test="${f.status == 'SKIPPED'}">
+                            <div class="jp-table-row">
+                                <l:icon src="symbol-status-skipped plugin-junit" />
+
+                                ${f.name}
 
-                        ${f.name}
+                                <j:if test="${it.class.simpleName eq 'TestResult'}">
+                                    <span class="jenkins-!-text-color-secondary jenkins-!-margin-left-2" style="font-family: var(--font-family-mono)">
+                                        <st:out value="${f.className}" />
+                                    </span>
+                                </j:if>
+
+                                <t:condition-tag test="${f}" clazz="jenkins-!-margin-left-2 jenkins-mobile-hide" />
+                            </div>
+                        </j:when>
+                        <j:otherwise>
+                            <a id="test-${id}-showlink" class="jp-table-row" href="${url}">
+                                <l:icon src="${f.status == 'PASSED' ? 'symbol-status-blue' : 'symbol-status-red'}" />
 
-                        <j:if test="${it.class.simpleName eq 'TestResult'}">
-                            <span class="jenkins-!-text-color-secondary jenkins-!-margin-left-2" style="font-family: var(--font-family-mono)">
-                                <st:out value="${f.className}" />
-                            </span>
-                        </j:if>
+                                ${f.name}
 
-                        <t:condition-tag test="${f}" clazz="jenkins-!-margin-left-2 jenkins-mobile-hide" />
+                                <j:if test="${it.class.simpleName eq 'TestResult'}">
+                                    <span class="jenkins-!-text-color-secondary jenkins-!-margin-left-2" style="font-family: var(--font-family-mono)">
+                                        <st:out value="${f.className}" />
+                                    </span>
+                                </j:if>
 
-                        <l:icon src="symbol-chevron-forward-outline plugin-ionicons-api" class="jenkins-!-margin-left-2" />
-                    </a>
+                                <t:condition-tag test="${f}" clazz="jenkins-!-margin-left-2 jenkins-mobile-hide" />
+
+                                <l:icon src="symbol-chevron-forward-outline plugin-ionicons-api" class="jenkins-!-margin-left-2" />
+                            </a>
+                        </j:otherwise>
+                    </j:choose>
 
                     <j:forEach var="badge" items="${f.testActions}">
                         <st:include it="${badge}" page="badge.jelly" optional="true" />

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

@@ -108,6 +108,10 @@ a.jp-pill, button.jp-pill {
 }
 
 /* Custom table row */
+a.jp-table-row {
+  cursor: pointer;
+}
+
 .jp-table-row {
   display: flex;
   align-items: center;
@@ -130,23 +134,22 @@ a.jp-pill, button.jp-pill {
   background: none;
   outline: none;
   border: none;
-  cursor: pointer;
   border-radius: inherit;
   transition: background var(--standard-transition);
 
-  svg:first-of-type {
-    width: 1.25rem;
-    height: 1.25rem;
-    margin-right: 1rem;
-  }
-
   svg:last-of-type {
     width: 1rem;
     height: 1rem;
     color: var(--text-color-secondary);
     transition: rotate var(--standard-transition);
   }
 
+  svg:first-of-type {
+    width: 1.25rem;
+    height: 1.25rem;
+    margin-right: 1rem;
+  }
+
   @media (width <= 800px) {
     display: grid;
     grid-template-columns: auto 1fr;