Use Server eventKey for Server Action

jenkinsci · Nov 22, 2024 · ad14730 · ad14730
1 parent c5915fa
commit ad14730
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...nkins/plugins/bitbucketpushandpullrequest/action/BitBucketPPRPullRequestServerAction.java b/...nkins/plugins/bitbucketpushandpullrequest/action/BitBucketPPRPullRequestServerAction.java
@@ -34,7 +34,7 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import static io.jenkins.plugins.bitbucketpushandpullrequest.common.BitBucketPPRConst.PULL_REQUEST_MERGED;
+import static io.jenkins.plugins.bitbucketpushandpullrequest.common.BitBucketPPRConst.PULL_REQUEST_SERVER_MERGED;
 import static java.util.Objects.isNull;
 import static org.apache.commons.lang3.ObjectUtils.isEmpty;
 
@@ -220,7 +220,7 @@ public String getLinkDecline() throws MalformedURLException {
 
   @Override
   public String getLatestCommit() {
-    if (PULL_REQUEST_MERGED.equalsIgnoreCase(this.bitbucketEvent.getAction())) {
+    if (PULL_REQUEST_SERVER_MERGED.equalsIgnoreCase(this.bitbucketEvent.getAction())) {
       return payload.getPullRequest().getMergeCommit().getHash();
     }
     return payload.getServerPullRequest().getFromRef().getLatestCommit();

diff --git a/...s/plugins/bitbucketpushandpullrequest/action/BitBucketPPRPullRequestServerActionTest.java b/...s/plugins/bitbucketpushandpullrequest/action/BitBucketPPRPullRequestServerActionTest.java
@@ -60,7 +60,7 @@ public void testGetMergeCommit() throws BitBucketPPRPayloadPropertyNotFoundExcep
       BitBucketPPRPayload payloadMock = mock(BitBucketPPRPayload.class, RETURNS_DEEP_STUBS);
       when(payloadMock.getPullRequest().getMergeCommit().getHash()).thenReturn("123456");
       BitBucketPPRHookEvent event = mock(BitBucketPPRHookEvent.class);
-      when(event.getAction()).thenReturn("fulfilled");
+      when(event.getAction()).thenReturn("merged");
       BitBucketPPRPullRequestServerAction action =
           new BitBucketPPRPullRequestServerAction(payloadMock, event);
       assertEquals("123456", action.getLatestCommit());