Skip to content

The Unified and Autonomous Development Platform

fix: Regression: unable to download artifact

Robin Shen87bb41e6bc61
diff --git a/server-plugin/server-plugin-report-playwright/src/main/java/io/onedev/server/plugin/report/playwright/PlaywrightTestCaseDetailPanel.java b/server-plugin/server-plugin-report-playwright/src/main/java/io/onedev/server/plugin/report/playwright/PlaywrightTestCaseDetailPanel.java
index ba13d63b23..dcda0fada7 100644
--- a/server-plugin/server-plugin-report-playwright/src/main/java/io/onedev/server/plugin/report/playwright/PlaywrightTestCaseDetailPanel.java
+++ b/server-plugin/server-plugin-report-playwright/src/main/java/io/onedev/server/plugin/report/playwright/PlaywrightTestCaseDetailPanel.java
@@ -18,8 +18,8 @@ import org.apache.wicket.request.cycle.RequestCycle;
import io.onedev.server.model.Build;
import io.onedev.server.plugin.report.playwright.PlaywrightReportParser.AttachmentData;
import io.onedev.server.plugin.report.playwright.PlaywrightReportParser.ResultData;
-import io.onedev.server.plugin.report.unittest.ArtifactResource;
-import io.onedev.server.plugin.report.unittest.ArtifactResourceReference;
+import io.onedev.server.plugin.report.unittest.TestArtifactResource;
+import io.onedev.server.plugin.report.unittest.TestArtifactResourceReference;
public class PlaywrightTestCaseDetailPanel extends Panel {
@@ -76,8 +76,8 @@ public class PlaywrightTestCaseDetailPanel extends Panel {
protected void populateItem(ListItem<AttachmentData> item) {
AttachmentData attachment = item.getModelObject();
String url = RequestCycle.get().urlFor(
- new ArtifactResourceReference(),
- ArtifactResource.paramsOf(
+ new TestArtifactResourceReference(),
+ TestArtifactResource.paramsOf(
build, reportName, attachment.path)).toString();
ExternalLink link = new ExternalLink("link", url);
link.add(new ExternalImage("image", url).setVisible(
diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/ArtifactResource.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/TestArtifactResource.java
similarity index 98%
rename from server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/ArtifactResource.java
rename to server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/TestArtifactResource.java
index 6b906917e8..74fab5e340 100644
--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/ArtifactResource.java
+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/TestArtifactResource.java
@@ -30,7 +30,7 @@ import io.onedev.server.service.BuildService;
import io.onedev.server.service.ProjectService;
import io.onedev.server.web.util.MimeUtils;
-public class ArtifactResource extends AbstractResource {
+public class TestArtifactResource extends AbstractResource {
private static final long serialVersionUID = 1L;
diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/ArtifactResourceReference.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/TestArtifactResourceReference.java
similarity index 60%
rename from server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/ArtifactResourceReference.java
rename to server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/TestArtifactResourceReference.java
index 989e8524e7..39d83f7ab7 100644
--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/ArtifactResourceReference.java
+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/TestArtifactResourceReference.java
@@ -3,17 +3,17 @@ package io.onedev.server.plugin.report.unittest;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.ResourceReference;
-public class ArtifactResourceReference extends ResourceReference {
+public class TestArtifactResourceReference extends ResourceReference {
private static final long serialVersionUID = 1L;
- public ArtifactResourceReference() {
- super("artifact");
+ public TestArtifactResourceReference() {
+ super("test-artifact");
}
@Override
public IResource getResource() {
- return new ArtifactResource();
+ return new TestArtifactResource();
}
}
diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestModule.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestModule.java
index 7460ef17a9..6437ef5d6a 100644
--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestModule.java
+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestModule.java
@@ -87,7 +87,7 @@ public class UnitTestModule extends AbstractPluginModule {
contribute(WebApplicationConfigurator.class, application -> {
application.mount(new BaseResourceMapper("~downloads/projects/${project}/builds/${build}/unit-test/${report}",
- new ArtifactResourceReference()));
+ new TestArtifactResourceReference()));
application.mount(new ProjectPageMapper("${project}/~builds/${build}/unit-test/${report}/test-suites", UnitTestSuitesPage.class));
application.mount(new ProjectPageMapper("${project}/~builds/${build}/unit-test/${report}/test-cases", UnitTestCasesPage.class));
application.mount(new ProjectPageMapper("${project}/~stats/unit-test", UnitTestStatsPage.class));