From: Janos Gyerik Date: Tue, 9 Apr 2019 09:41:44 +0000 (+0200) Subject: SONAR-11946 Point to Overview page of a PR in report-task.txt X-Git-Tag: 7.8~425 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e1a6620e18b4b5d14435461289808db9221799f8;p=sonarqube.git SONAR-11946 Point to Overview page of a PR in report-task.txt --- diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java index 5ed8769d2f9..dbee000ded1 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java @@ -246,11 +246,9 @@ public class ReportPublisher implements Startable { if (onPullRequest(branchConfiguration)) { return httpUrl.newBuilder() - .addPathSegment("project") - .addPathSegment("issues") + .addPathSegment(DASHBOARD) .addEncodedQueryParameter(ID, encoded(effectiveKey)) .addEncodedQueryParameter("pullRequest", encoded(branchConfiguration.pullRequestKey())) - .addQueryParameter(RESOLVED, "false") .build() .url(); } diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/ReportPublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/ReportPublisherTest.java index 32a8e04e6e2..4c3699326a0 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/ReportPublisherTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/ReportPublisherTest.java @@ -201,14 +201,14 @@ public class ReportPublisherTest { underTest.logSuccess("TASK-123"); assertThat(logTester.logs(LoggerLevel.INFO)) - .contains("ANALYSIS SUCCESSFUL, you can browse https://publicserver/sonarqube/project/issues?id=org.sonarsource.sonarqube%3Asonarqube&pullRequest=105&resolved=false") + .contains("ANALYSIS SUCCESSFUL, you can browse https://publicserver/sonarqube/dashboard?id=org.sonarsource.sonarqube%3Asonarqube&pullRequest=105") .contains("More about the report processing at https://publicserver/sonarqube/api/ce/task?id=TASK-123"); assertThat(readFileToString(properties.metadataFilePath().toFile(), StandardCharsets.UTF_8)).isEqualTo( "projectKey=org.sonarsource.sonarqube:sonarqube\n" + "serverUrl=https://publicserver/sonarqube\n" + "serverVersion=6.4\n" + - "dashboardUrl=https://publicserver/sonarqube/project/issues?id=org.sonarsource.sonarqube%3Asonarqube&pullRequest=105&resolved=false\n" + + "dashboardUrl=https://publicserver/sonarqube/dashboard?id=org.sonarsource.sonarqube%3Asonarqube&pullRequest=105\n" + "ceTaskId=TASK-123\n" + "ceTaskUrl=https://publicserver/sonarqube/api/ce/task?id=TASK-123\n"); }