diff options
14 files changed, 26 insertions, 26 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/AbstractNewIssuesEmailTemplate.java b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/AbstractNewIssuesEmailTemplate.java index 46c7ef956f7..cf7bfafbe79 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/AbstractNewIssuesEmailTemplate.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/AbstractNewIssuesEmailTemplate.java @@ -196,7 +196,7 @@ public abstract class AbstractNewIssuesEmailTemplate extends EmailTemplate { } url += "&createdAt=" + encode(DateUtils.formatDateTime(date)); message - .append("See it in SonarQube: ") + .append("More details at: ") .append(url) .append(NEW_LINE); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangesEmailTemplate.java b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangesEmailTemplate.java index 81c8a698502..c8e06691815 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangesEmailTemplate.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/IssueChangesEmailTemplate.java @@ -106,7 +106,7 @@ public class IssueChangesEmailTemplate extends EmailTemplate { private void appendFooter(StringBuilder sb, Notification notification){ String issueKey = notification.getFieldValue("key"); try { - sb.append("See it in SonarQube: ").append(settings.getServerBaseURL()) + sb.append("More details at: ").append(settings.getServerBaseURL()) .append("/project/issues?id=").append(encode(notification.getFieldValue("projectKey"), "UTF-8")) .append("&issues=").append(issueKey) .append("&open=").append(issueKey); diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplate.java b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplate.java index 5d079155a50..fcf02e34b46 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplate.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplate.java @@ -69,7 +69,7 @@ public class MyNewIssuesEmailTemplate extends AbstractNewIssuesEmailTemplate { } url += "&createdAt=" + encode(DateUtils.formatDateTime(date)); message - .append("See it in SonarQube: ") + .append("More details at: ") .append(url) .append(NEW_LINE); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/email/AlertsEmailTemplate.java b/server/sonar-server/src/main/java/org/sonar/server/notification/email/AlertsEmailTemplate.java index 214fd5b8985..d00e7600396 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/notification/email/AlertsEmailTemplate.java +++ b/server/sonar-server/src/main/java/org/sonar/server/notification/email/AlertsEmailTemplate.java @@ -109,7 +109,7 @@ public class AlertsEmailTemplate extends EmailTemplate { } } - messageBody.append("\n").append("See it in SonarQube: ").append(configuration.getServerBaseURL()).append("/dashboard?id=").append(projectKey); + messageBody.append("\n").append("More details at: ").append(configuration.getServerBaseURL()).append("/dashboard?id=").append(projectKey); if (branchName != null) { messageBody.append("&branch=").append(branchName); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java index 587ecd3c92a..e5300cd493b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java @@ -107,7 +107,7 @@ public class MyNewIssuesEmailTemplateTest { " /path/to/file: 3\n" + " /path/to/directory: 7\n" + "\n" + - "See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&assignees=lo.gin&createdAt=2010-05-18"); + "More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&assignees=lo.gin&createdAt=2010-05-18"); } @Test @@ -153,7 +153,7 @@ public class MyNewIssuesEmailTemplateTest { " Type\n" + " Bug: 1 Vulnerability: 3 Code Smell: 0\n" + "\n" + - "See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&assignees=lo.gin&createdAt=2010-05-18"); + "More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&assignees=lo.gin&createdAt=2010-05-18"); } @Test @@ -172,7 +172,7 @@ public class MyNewIssuesEmailTemplateTest { " Type\n" + " Bug: 1 Vulnerability: 3 Code Smell: 0\n" + "\n" + - "See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&assignees=lo.gin&branch=feature1&createdAt=2010-05-18"); + "More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&assignees=lo.gin&branch=feature1&createdAt=2010-05-18"); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest.java index 80455bb8205..03a63654ebf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest.java @@ -138,7 +138,7 @@ public class NewIssuesEmailTemplateTest { " /path/to/file: 3\n" + " /path/to/directory: 7\n" + "\n" + - "See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&createdAt=2010-05-1"); + "More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&createdAt=2010-05-1"); } @Test @@ -156,7 +156,7 @@ public class NewIssuesEmailTemplateTest { " Type\n" + " Bug: 1 Vulnerability: 10 Code Smell: 3\n" + "\n" + - "See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&createdAt=2010-05-1"); + "More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&createdAt=2010-05-1"); } @Test @@ -185,7 +185,7 @@ public class NewIssuesEmailTemplateTest { " Type\n" + " Bug: 1 Vulnerability: 10 Code Smell: 3\n" + "\n" + - "See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&branch=feature1&createdAt=2010-05-1"); + "More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&branch=feature1&createdAt=2010-05-1"); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java b/server/sonar-server/src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java index af8a6e5df94..bf35696f17c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/notification/email/AlertsEmailTemplateTest.java @@ -64,7 +64,7 @@ public class AlertsEmailTemplateTest { " - violations > 4\n" + " - coverage < 75%\n" + "\n" + - "See it in SonarQube: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo")); + "More details at: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo")); } @Test @@ -83,7 +83,7 @@ public class AlertsEmailTemplateTest { " - violations > 4\n" + " - coverage < 75%\n" + "\n" + - "See it in SonarQube: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo&branch=feature")); + "More details at: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo&branch=feature")); } @Test @@ -101,7 +101,7 @@ public class AlertsEmailTemplateTest { " - violations > 4\n" + " - coverage < 75%\n" + "\n" + - "See it in SonarQube: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo")); + "More details at: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo")); } @Test @@ -117,7 +117,7 @@ public class AlertsEmailTemplateTest { "\n" + "New quality gate threshold: violations > 4\n" + "\n" + - "See it in SonarQube: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo")); + "More details at: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo")); } @Test @@ -134,7 +134,7 @@ public class AlertsEmailTemplateTest { "\n" + "New quality gate threshold: violations > 4\n" + "\n" + - "See it in SonarQube: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo&branch=feature")); + "More details at: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo&branch=feature")); } @Test @@ -149,7 +149,7 @@ public class AlertsEmailTemplateTest { "Quality gate status: Green (was Red)\n" + "\n" + "\n" + - "See it in SonarQube: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo")); + "More details at: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo")); } @Test @@ -165,7 +165,7 @@ public class AlertsEmailTemplateTest { "Quality gate status: Green (was Red)\n" + "\n" + "\n" + - "See it in SonarQube: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo&branch=feature")); + "More details at: http://nemo.sonarsource.org/dashboard?id=org.sonar.foo:foo&branch=feature")); } private Notification createNotification(String alertName, String alertText, String alertLevel, String isNewAlert) { diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/display_component_key_if_no_component_name.txt b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/display_component_key_if_no_component_name.txt index d60a94074b7..44247b63e91 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/display_component_key_if_no_component_name.txt +++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/display_component_key_if_no_component_name.txt @@ -3,4 +3,4 @@ Rule: Avoid Cycles Message: Has 3 cycles -See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE +More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_should_display_resolution_change.txt b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_should_display_resolution_change.txt index a098041a848..012179a9719 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_should_display_resolution_change.txt +++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_should_display_resolution_change.txt @@ -4,4 +4,4 @@ Message: Has 3 cycles Resolution: FIXED (was FALSE-POSITIVE) -See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE +More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_action_plan_change.txt b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_action_plan_change.txt index 5bc4f6237da..38b0ad5c070 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_action_plan_change.txt +++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_action_plan_change.txt @@ -4,4 +4,4 @@ Message: Has 3 cycles Action Plan changed to ABC 1.0 -See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE +More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_assignee_change.txt b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_assignee_change.txt index 15768633c9d..86d1601fe6d 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_assignee_change.txt +++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_assignee_change.txt @@ -4,4 +4,4 @@ Message: Has 3 cycles Assignee changed to louis -See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE +More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_issue_on_branch.txt b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_issue_on_branch.txt index b9a5c6bee22..27b7a1db23a 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_issue_on_branch.txt +++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_issue_on_branch.txt @@ -3,4 +3,4 @@ Rule: Avoid Cycles Message: Has 3 cycles -See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE&branch=feature1 +More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE&branch=feature1 diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_multiple_changes.txt b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_multiple_changes.txt index 5def650c041..7d229f5deb8 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_multiple_changes.txt +++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/notification/IssueChangesEmailTemplateTest/email_with_multiple_changes.txt @@ -9,4 +9,4 @@ Resolution: FALSE-POSITIVE Status: RESOLVED Tags: [bug performance] -See it in SonarQube: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE +More details at: http://nemo.sonarsource.org/project/issues?id=org.apache%3Astruts&issues=ABCDE&open=ABCDE diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueNotificationsTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueNotificationsTest.java index a8c63074e1d..7fb89f7cdaf 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueNotificationsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueNotificationsTest.java @@ -156,7 +156,7 @@ public class IssueNotificationsTest extends AbstractIssueTest { assertThat((String) message.getContent()).contains("Type"); assertThat((String) message.getContent()).contains("One Issue Per Line (xoo): 17"); assertThat((String) message.getContent()).contains( - "See it in SonarQube: http://localhost:9000/project/issues?id=sample&createdAt=2015-12-15T00%3A00%3A00%2B"); + "More details at: http://localhost:9000/project/issues?id=sample&createdAt=2015-12-15T00%3A00%3A00%2B"); assertThat(emails.hasNext()).isTrue(); message = emails.next().getMimeMessage(); @@ -164,7 +164,7 @@ public class IssueNotificationsTest extends AbstractIssueTest { assertThat((String) message.getContent()).contains("sample/Sample.xoo"); assertThat((String) message.getContent()).contains("Assignee changed to Tester"); assertThat((String) message.getContent()).contains( - "See it in SonarQube: http://localhost:9000/project/issues?id=sample&issues=" + issue.key() + "&open=" + issue.key()); + "More details at: http://localhost:9000/project/issues?id=sample&issues=" + issue.key() + "&open=" + issue.key()); assertThat(emails.hasNext()).isFalse(); } @@ -226,7 +226,7 @@ public class IssueNotificationsTest extends AbstractIssueTest { assertThat((String) message.getContent()).contains("sample/Sample.xoo"); assertThat((String) message.getContent()).contains("Severity: BLOCKER (was MINOR)"); assertThat((String) message.getContent()).contains( - "See it in SonarQube: http://localhost:9000/project/issues?id=sample&issues=" + issue.key() + "&open=" + issue.key()); + "More details at: http://localhost:9000/project/issues?id=sample&issues=" + issue.key() + "&open=" + issue.key()); assertThat(emails.hasNext()).isFalse(); } |