mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-18 06:22:29 +00:00
[FIXED JENKINS-9637] Make link on Job page to aggregated Test result appear correctly
This commit is contained in:
1 parent
7ec8787122
commit
dd2b4a1805
2 files changed
+30
-15
No files matched your search
@@ -31,7 +31,7 @@ THE SOFTWARE.
|
||||
</j:if>
|
||||
|
||||
<p:projectActionFloatingBox />
|
||||
|
||||
|
||||
<table style="margin-top: 1em; margin-left:1em;">
|
||||
|
||||
<j:forEach var="act" items="${it.prominentActions}">
|
||||
@@ -53,7 +53,7 @@ THE SOFTWARE.
|
||||
|
||||
<j:set var="tr" value="${it.lastCompletedBuild.testResultAction}"/>
|
||||
<j:if test="${tr!=null}">
|
||||
<j:if test="${tr.class.name != 'hudson.tasks.test.AggregatedTestResultAction'}">
|
||||
<j:if test="${tr.class.name != 'hudson.tasks.test.AggregatedTestResultPublisher$TestResultAction'}">
|
||||
<t:summary icon="clipboard.png">
|
||||
<a href="lastCompletedBuild/${tr.urlName}/" class="model-link inside">${%Latest Test Result}</a>
|
||||
<t:test-result it="${tr}" />
|
||||
@@ -61,13 +61,16 @@ THE SOFTWARE.
|
||||
</j:if>
|
||||
</j:if>
|
||||
|
||||
<j:set var="atr" value="${it.lastCompletedBuild.aggregatedTestResultAction}"/>
|
||||
<j:if test="${atr!=null}">
|
||||
<t:summary icon="clipboard.png">
|
||||
<a href="lastCompletedBuild/aggregatedTestReport/" class="model-link inside">${%Latest Aggregated Test Result}</a>
|
||||
<t:test-result it="${atr}" />
|
||||
</t:summary>
|
||||
</j:if>
|
||||
<j:forEach var="atr" items="${it.lastCompletedBuild.actions}">
|
||||
<j:if test="${atr!=null}">
|
||||
<j:if test="${atr.class.name == 'hudson.tasks.test.AggregatedTestResultPublisher$TestResultAction'}">
|
||||
<t:summary icon="clipboard.png">
|
||||
<a href="lastCompletedBuild/${atr.urlName}/" class="model-link inside">${%Latest Aggregated Test Result}</a>
|
||||
<t:test-result it="${atr}" />
|
||||
</t:summary>
|
||||
</j:if>
|
||||
</j:if>
|
||||
</j:forEach>
|
||||
|
||||
</table>
|
||||
|
||||
|
||||
@@ -56,9 +56,10 @@ public class AggregatedTestResultPublisherTest {
|
||||
buildAndSetupPageObjects();
|
||||
|
||||
projectPage.getLatestAggregatedTestReportLink()
|
||||
.assertHasLatestTestResultText()
|
||||
.assertHasLatestAggregatedTestResultText()
|
||||
.assertHasTests()
|
||||
.follow().hasLinkToTestResultOfBuild(TEST_PROJECT_NAME, 1);
|
||||
|
||||
projectPage.assertNoTestReportLink();
|
||||
|
||||
buildPage.getAggregatedTestReportLink()
|
||||
@@ -80,7 +81,10 @@ public class AggregatedTestResultPublisherTest {
|
||||
.assertHasLatestTestResultText()
|
||||
.assertHasTests()
|
||||
.follow();
|
||||
projectPage.assertNoAggregatedTestReportLink();
|
||||
projectPage.getLatestAggregatedTestReportLink()
|
||||
.assertHasLatestAggregatedTestResultText()
|
||||
.assertNoTests()
|
||||
.follow();
|
||||
|
||||
buildPage.getTestReportLink()
|
||||
.assertHasTestResultText()
|
||||
@@ -88,7 +92,8 @@ public class AggregatedTestResultPublisherTest {
|
||||
.follow();
|
||||
buildPage.getAggregatedTestReportLink()
|
||||
.assertHasAggregatedTestResultText()
|
||||
.assertNoTests();
|
||||
.assertNoTests()
|
||||
.follow();
|
||||
}
|
||||
|
||||
@LocalData
|
||||
@@ -103,7 +108,10 @@ public class AggregatedTestResultPublisherTest {
|
||||
.assertHasLatestTestResultText()
|
||||
.assertHasTests()
|
||||
.follow();
|
||||
projectPage.assertNoAggregatedTestReportLink();
|
||||
projectPage.getLatestAggregatedTestReportLink()
|
||||
.assertHasLatestAggregatedTestResultText()
|
||||
.assertHasTests()
|
||||
.follow();
|
||||
|
||||
buildPage.getTestReportLink()
|
||||
.assertHasTestResultText()
|
||||
@@ -123,11 +131,15 @@ public class AggregatedTestResultPublisherTest {
|
||||
}
|
||||
|
||||
private void buildOnce() throws Exception {
|
||||
build(1);
|
||||
}
|
||||
|
||||
private void build(int numberOfDownstreamBuilds) throws Exception {
|
||||
build = j.buildAndAssertSuccess(upstreamProject);
|
||||
j.waitUntilNoActivity();
|
||||
|
||||
List<AbstractBuild<?, ?>> downstreamBuilds = ImmutableList.copyOf(build.getDownstreamBuilds(downstreamProject));
|
||||
assertThat(downstreamBuilds, hasSize(1));
|
||||
assertThat(downstreamBuilds, hasSize(numberOfDownstreamBuilds));
|
||||
}
|
||||
|
||||
|
||||
@@ -169,7 +181,7 @@ public class AggregatedTestResultPublisherTest {
|
||||
private void addFingerprinterToProject(FreeStyleProject project, String[] contents, String[] files) throws Exception {
|
||||
StringBuilder targets = new StringBuilder();
|
||||
for (int i = 0; i < contents.length; i++) {
|
||||
project.getBuildersList().add(new Shell("echo " + contents[i] + " > " + files[i]));
|
||||
project.getBuildersList().add(new Shell("echo $BUILD_NUMBER " + contents[i] + " > " + files[i]));
|
||||
targets.append(files[i]).append(',');
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user