Comments on closed/merged issues trigger Commented event #42

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 Changelog of Pull Request Notifier for Stash.
 
+## 1.17
+* Ignoring events if pull request is closed
+
 ## 1.16
 * Triggering also on comment replies if COMMENTED event is checked.
 

src/main/java/se/bjurr/prnfs/listener/PrnfsPullRequestEventListener.java

@@ -115,6 +115,9 @@ public void onEvent(PullRequestUpdatedEvent e) {
  @VisibleForTesting
  public void handleEvent(PullRequestEvent pullRequestEvent) {
   try {
+   if (pullRequestEvent.getPullRequest().isClosed()) {
+    return;
+   }
    final PrnfsSettings settings = getPrnfsSettings(pluginSettingsFactory.createGlobalSettings());
    for (final PrnfsNotification notification : settings.getNotifications()) {
     final PrnfsRenderer renderer = new PrnfsRenderer(pullRequestEvent, repositoryService, notification);

src/test/java/se/bjurr/prnfs/admin/PrnfsPullRequestEventListenerTest.java

@@ -82,6 +82,17 @@ public void testThatAUrlIsOnlyInvokedForConfiguredEvents() {
       .withId(10L).withPullRequestAction(MERGED).build()).invokedNoUrl();
  }
 
+ @Test
+ public void testThatClosedPullRequestsAreIgnored() {
+  prnfsTestBuilder()
+    .isLoggedInAsAdmin()
+    .withNotification(
+      notificationBuilder().withFieldValue(AdminFormValues.FIELDS.url, "http://bjurr.se/")
+        .withFieldValue(AdminFormValues.FIELDS.events, OPENED.name()).build()).store()
+    .trigger(pullRequestEventBuilder() //
+      .beingClosed().withToRef(pullRequestRefBuilder()).withPullRequestAction(OPENED).build()).invokedNoUrl();
+ }
+
  @Test
  public void testThatAUrlWithoutVariablesCanBeInvoked() {
   prnfsTestBuilder()

src/test/java/se/bjurr/prnfs/admin/utils/PullRequestEventBuilder.java

@@ -24,6 +24,7 @@ public class PullRequestEventBuilder {
  private PullRequestParticipant author;
  private String commentText;
  private final PrnfsTestBuilder prnfsTestBuilder;
+ private boolean beingClosed;
 
  private PullRequestEventBuilder(PrnfsTestBuilder prnfsTestBuilder) {
   this.prnfsTestBuilder = prnfsTestBuilder;
@@ -98,6 +99,7 @@ public PullRequestEvent build() {
    pullRequestEvent = event;
   }
   final PullRequest pullRequest = mock(PullRequest.class);
+  when(pullRequest.isClosed()).thenReturn(beingClosed);
   when(pullRequestEvent.getAction()).thenReturn(pullRequestAction);
   when(pullRequestEvent.getPullRequest()).thenReturn(pullRequest);
   when(pullRequestEvent.getPullRequest().getAuthor()).thenReturn(author);
@@ -110,4 +112,9 @@ public PullRequestEvent build() {
  public PrnfsTestBuilder triggerEvent() {
   return prnfsTestBuilder.trigger(build());
  }
+
+ public PullRequestEventBuilder beingClosed() {
+  beingClosed = true;
+  return this;
+ }
 }