diff --git a/src/main/java/org/jenkinsci/plugins/ghprb/extensions/status/GhprbSimpleStatus.java b/src/main/java/org/jenkinsci/plugins/ghprb/extensions/status/GhprbSimpleStatus.java index d58efafa0..a38fb8091 100644 --- a/src/main/java/org/jenkinsci/plugins/ghprb/extensions/status/GhprbSimpleStatus.java +++ b/src/main/java/org/jenkinsci/plugins/ghprb/extensions/status/GhprbSimpleStatus.java @@ -132,11 +132,11 @@ public void onBuildTriggered(Job project, if (!StringUtils.isEmpty(triggeredStatus)) { sb.append(Ghprb.replaceMacros(project, triggeredStatus)); } else { - sb.append("Build triggered."); + sb.append("Build triggered"); if (isMergeable) { - sb.append(" sha1 is merged."); + sb.append(" for merge commit."); } else { - sb.append(" sha1 is original commit."); + sb.append(" for original commit."); } } @@ -184,7 +184,7 @@ public void onBuildStart(Run build, if (StringUtils.isEmpty(startedStatus)) { sb.append("Build started"); if (c != null) { - sb.append(c.isMerged() ? " sha1 is merged." : " sha1 is original commit."); + sb.append(c.isMerged() ? " for merge commit." : " for original commit."); } } else { sb.append(Ghprb.replaceMacros(build, listener, startedStatus)); diff --git a/src/test/java/org/jenkinsci/plugins/ghprb/GhprbRepositoryTest.java b/src/test/java/org/jenkinsci/plugins/ghprb/GhprbRepositoryTest.java index c54d9abf3..32653c7c3 100644 --- a/src/test/java/org/jenkinsci/plugins/ghprb/GhprbRepositoryTest.java +++ b/src/test/java/org/jenkinsci/plugins/ghprb/GhprbRepositoryTest.java @@ -72,7 +72,7 @@ public class GhprbRepositoryTest { private static final Date UPDATE_DATE = new Date(); - private static final String MSG = "Build triggered. sha1 is merged."; + private static final String MSG = "Build triggered for merge commit."; @Mock private GHRepository ghRepository; diff --git a/src/test/java/org/jenkinsci/plugins/ghprb/extensions/status/GhprbSimpleStatusTest.java b/src/test/java/org/jenkinsci/plugins/ghprb/extensions/status/GhprbSimpleStatusTest.java index a025b21b0..71a13c35b 100644 --- a/src/test/java/org/jenkinsci/plugins/ghprb/extensions/status/GhprbSimpleStatusTest.java +++ b/src/test/java/org/jenkinsci/plugins/ghprb/extensions/status/GhprbSimpleStatusTest.java @@ -41,7 +41,7 @@ public void setUp() throws Exception { @Test public void testMergedMessage() throws Exception { - String mergedMessage = "Build triggered. sha1 is merged."; + String mergedMessage = "Build triggered for merge commit."; given(ghprbPullRequest.getHead()).willReturn("sha"); given(ghprbPullRequest.isMergeable()).willReturn(true); @@ -56,7 +56,7 @@ public void testMergedMessage() throws Exception { @Test public void testMergeConflictMessage() throws Exception { - String mergedMessage = "Build triggered. sha1 is original commit."; + String mergedMessage = "Build triggered for original commit."; given(ghprbPullRequest.getHead()).willReturn("sha"); given(ghprbPullRequest.isMergeable()).willReturn(false); @@ -71,7 +71,7 @@ public void testMergeConflictMessage() throws Exception { @Test public void testDoesNotSendEmptyContext() throws Exception { - String mergedMessage = "Build triggered. sha1 is original commit."; + String mergedMessage = "Build triggered for original commit."; given(ghprbPullRequest.getHead()).willReturn("sha"); given(ghprbPullRequest.isMergeable()).willReturn(false);