Forward merge to master

bitbucket-slack-server-integration-plugin/pom.xml

@@ -5,7 +5,7 @@
     <groupId>com.atlassian.bitbucket.plugins</groupId>
     <artifactId>bitbucket-slack-server-integration-plugin</artifactId>
     <packaging>atlassian-plugin</packaging>
-    <version>4.0.9-SNAPSHOT</version>
+    <version>4.0.10-SNAPSHOT</version>
 
     <name>Slack for Bitbucket Data Center</name>
     <description>This is the Slack integration for Bitbucket Data Center</description>

bitbucket-slack-server-integration-plugin/src/main/java/com/atlassian/bitbucket/plugins/slack/notification/NotificationUtil.java

@@ -1,5 +1,7 @@
 package com.atlassian.bitbucket.plugins.slack.notification;
 
+import static com.atlassian.bitbucket.plugins.slack.notification.PullRequestNotificationTypes.RESCOPED;
+
 import lombok.experimental.UtilityClass;
 
 import java.util.Collections;
@@ -12,7 +14,9 @@
 public class NotificationUtil {
     public static Set<String> ALL_NOTIFICATION_TYPE_KEYS = Collections.unmodifiableSet(Stream
             .of(
-                    Stream.of(PullRequestNotificationTypes.values()).map(PullRequestNotificationTypes::getKey),
+                    Stream.of(PullRequestNotificationTypes.values())
+                        .filter(type -> RESCOPED != type)
+                        .map(PullRequestNotificationTypes::getKey),
                     Stream.of(RepositoryNotificationTypes.values()).map(RepositoryNotificationTypes::getKey),
                     Stream.of(TaskNotificationTypes.values()).map(TaskNotificationTypes::getKey)
             )

bitbucket-slack-server-integration-plugin/src/main/java/com/atlassian/bitbucket/plugins/slack/notification/PullRequestNotificationTypes.java

@@ -13,6 +13,7 @@
 import com.atlassian.bitbucket.event.pull.PullRequestParticipantReviewedEvent;
 import com.atlassian.bitbucket.event.pull.PullRequestParticipantUnapprovedEvent;
 import com.atlassian.bitbucket.event.pull.PullRequestReopenedEvent;
+import com.atlassian.bitbucket.event.pull.PullRequestRescopedEvent;
 import com.atlassian.bitbucket.event.pull.PullRequestReviewersUpdatedEvent;
 import com.atlassian.bitbucket.event.pull.PullRequestUpdatedEvent;
 import com.atlassian.sal.api.message.I18nResolver;
@@ -26,6 +27,7 @@
 public enum PullRequestNotificationTypes {
     OPENED("PRCreated"),
     UPDATED("PRParticipantUpdated"),
+    RESCOPED("PRReScoped"),
     DECLINED("PRDeclined"),
     REOPENED("PRReopened"),
     MERGED("PRMerged"),
@@ -45,6 +47,7 @@ public enum PullRequestNotificationTypes {
             ImmutableMap.<Class<? extends PullRequestEvent>, PullRequestNotificationTypes>builder()
                     .put(PullRequestOpenedEvent.class, PullRequestNotificationTypes.OPENED)
                     .put(PullRequestUpdatedEvent.class, PullRequestNotificationTypes.UPDATED)
+                    .put(PullRequestRescopedEvent.class, PullRequestNotificationTypes.RESCOPED)
                     .put(PullRequestDeclinedEvent.class, PullRequestNotificationTypes.DECLINED)
                     .put(PullRequestReopenedEvent.class, PullRequestNotificationTypes.REOPENED)
                     .put(PullRequestMergedEvent.class, PullRequestNotificationTypes.MERGED)

bitbucket-slack-server-integration-plugin/src/main/resources/com/atlassian/bitbucket/plugins/slack/bitbucket-slack.properties

@@ -227,6 +227,7 @@ slack.activity.pr.reviewed.short=:warning: {0} *reviewed* pull request {1} in {2
 slack.activity.pr.unapproved.needswork.short={0} *removed needs work review* from pull request {1} in {2}
 slack.activity.pr.merged.short=:tada: {0} *merged* pull request {1} in {2}
 slack.activity.pr.updated.short={0} *updated* pull request {1} in {2}
+slack.activity.pr.rescoped.short={0} *re-scoped* pull request {1} in {2}
 slack.activity.pr.comment.added.short=:speech_balloon: {0} *commented* on pull request {1} in {2}
 slack.activity.pr.comment.deleted.short=:speech_balloon: {0} *deleted a comment* on pull request {1} in {2}
 slack.activity.pr.comment.edited.short=:speech_balloon: {0} *edited a comment* on pull request {1} in {2}
@@ -249,6 +250,7 @@ slack.activity.pr.reviewed.long=:warning: {0} *reviewed* pull request {1} {3} \u
 slack.activity.pr.unapproved.needswork.long={0} *removed needs work review* from pull request {1} {3} \u2192 {4} in {2}
 slack.activity.pr.merged.long=:tada: {0} *merged* pull request {1} {3} \u2192 {4} in {2}
 slack.activity.pr.updated.long={0} *updated* pull request {1} {3} \u2192 {4} in {2}
+slack.activity.pr.rescoped.long={0} *re-scoped* pull request {1} {3} \u2192 {4} in {2}
 slack.activity.pr.comment.added.long=:speech_balloon: {0} *commented* on pull request {1} {3} \u2192 {4} in {2}
 slack.activity.pr.comment.deleted.long=:speech_balloon: {0} *deleted a comment* on pull request {1} {3} \u2192 {4} in {2}
 slack.activity.pr.comment.edited.long=:speech_balloon: {0} *edited a comment* on pull request {1} {3} \u2192 {4} in {2}

bitbucket-slack-server-integration-plugin/src/test/java/com/atlassian/bitbucket/plugins/slack/listener/BitbucketNotificationEventListenerTest.java

@@ -29,6 +29,7 @@
 import com.atlassian.bitbucket.event.pull.PullRequestParticipantReviewedEvent;
 import com.atlassian.bitbucket.event.pull.PullRequestParticipantUnapprovedEvent;
 import com.atlassian.bitbucket.event.pull.PullRequestReopenedEvent;
+import com.atlassian.bitbucket.event.pull.PullRequestRescopedEvent;
 import com.atlassian.bitbucket.event.pull.PullRequestReviewersUpdatedEvent;
 import com.atlassian.bitbucket.event.pull.PullRequestUpdatedEvent;
 import com.atlassian.bitbucket.event.repository.RepositoryForkedEvent;
@@ -90,6 +91,8 @@ class BitbucketNotificationEventListenerTest {
     @Mock
     private PullRequestUpdatedEvent pullRequestUpdatedEvent;
     @Mock
+    private PullRequestRescopedEvent pullRequestRescopedEvent;
+    @Mock
     private PullRequestDeclinedEvent pullRequestDeclinedEvent;
     @Mock
     private PullRequestReopenedEvent pullRequestReopenedEvent;
@@ -267,6 +270,11 @@ void onEvent_pullRequestUpdatedEvent_shouldCallExpectedMethods() {
         testPullRequestEvent(pullRequestUpdatedEvent, PullRequestNotificationTypes.UPDATED);
     }
 
+    @Test
+    void onEvent_pullRequestRescopedEvent_shouldCallExpectedMethods() {
+        testPullRequestEvent(pullRequestRescopedEvent, PullRequestNotificationTypes.RESCOPED);
+    }
+
     @Test
     void onEvent_pullRequestDeclinedEvent_shouldCallExpectedMethods() {
         testPullRequestEvent(pullRequestDeclinedEvent, PullRequestNotificationTypes.DECLINED);

bitbucket-slack-server-integration-plugin/src/test/java/com/atlassian/bitbucket/plugins/slack/notification/configuration/DefaultNotificationConfigurationServiceTest.java

@@ -22,7 +22,6 @@
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
 public class DefaultNotificationConfigurationServiceTest {

bitbucket-slack-server-integration-plugin/src/test/java/com/atlassian/bitbucket/plugins/slack/notification/renderer/SlackNotificationRendererTest.java

@@ -17,6 +17,7 @@
 import com.atlassian.bitbucket.event.pull.PullRequestParticipantReviewedEvent;
 import com.atlassian.bitbucket.event.pull.PullRequestParticipantUnapprovedEvent;
 import com.atlassian.bitbucket.event.pull.PullRequestReopenedEvent;
+import com.atlassian.bitbucket.event.pull.PullRequestRescopedEvent;
 import com.atlassian.bitbucket.event.pull.PullRequestReviewersUpdatedEvent;
 import com.atlassian.bitbucket.event.pull.PullRequestUpdatedEvent;
 import com.atlassian.bitbucket.event.repository.RepositoryForkedEvent;
@@ -142,6 +143,8 @@ public class SlackNotificationRendererTest {
     @Mock
     PullRequestUpdatedEvent pullRequestUpdatedEvent;
     @Mock
+    PullRequestRescopedEvent pullRequestRescopedEvent;
+    @Mock
     PullRequestCommentEvent pullRequestCommentEvent;
     @Mock
     PullRequestReviewersUpdatedEvent pullRequestReviewersUpdatedEvent;
@@ -479,6 +482,16 @@ void getPullRequestOpenedMessage_shouldBuildCorrectSlackMessage() {
         testGenericPullRequestMessage(pullRequestOpenedEvent, PullRequestAction.OPENED);
     }
 
+    @Test
+    void getPullRequestUpdatedMessage_shouldBuildCorrectSlackMessage() {
+        testGenericPullRequestMessage(pullRequestUpdatedEvent, PullRequestAction.UPDATED);
+    }
+
+    @Test
+    void getPullRequestRescopedMessage_shouldBuildCorrectSlackMessage() {
+        testGenericPullRequestMessage(pullRequestRescopedEvent, PullRequestAction.RESCOPED);
+    }
+
     @Test
     void getPullRequestApprovedMessage_shouldBuildCorrectSlackMessage() {
         testGenericPullRequestMessage(pullRequestApprovedEvent, PullRequestAction.APPROVED);

confluence-slack-integration/confluence-slack-server-integration-plugin/pom.xml

@@ -11,7 +11,7 @@
     <artifactId>confluence-slack-server-integration-plugin</artifactId>
     <packaging>atlassian-plugin</packaging>
     <name>Slack for Confluence Data Center</name>
-    <version>3.0.5-SNAPSHOT</version>
+    <version>3.0.6-SNAPSHOT</version>
     <description>This is the Slack integration for Confluence Data Center</description>
 
     <properties>

confluence-slack-integration/confluence-slack-server-integration-plugin/src/main/resources/js/confluence-slack-status.js

@@ -61,7 +61,7 @@ require([
         event.stopPropagation();
     }
 
-    $(function () {
-        $('body').bind('ajaxComplete', handleAjaxComplete);
+    $(function() {
+        $(document).on('ajaxComplete', handleAjaxComplete);
     });
 });

jira-slack-server-integration/jira-slack-server-integration-plugin/src/main/resources/js/jira-slack-status.js

@@ -49,6 +49,6 @@ require([
     }
 
     $(function() {
-        $('body').bind('ajaxComplete', handleAjaxComplete);
+        $(document).on('ajaxComplete', handleAjaxComplete);
     });
 });

jira-slack-server-integration/jira-slack-server-integration-plugin/src/test/java/it/com/atlassian/jira/plugins/slack/functional/SanityCheckFuncTest.java

@@ -6,17 +6,17 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static com.atlassian.jira.testkit.client.util.TimeBombLicence.LICENCE_FOR_TESTING;
 import static com.atlassian.plugins.slack.test.RequestMatchers.success;
 import static it.com.atlassian.jira.plugins.slack.util.JiraFuncTestData.SAMPLE_DATA;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 
 @SkipCacheCheck
 public class SanityCheckFuncTest extends SlackFunctionalTestBase {
+
     @Before
     public void beforeEach() {
-        backdoor.restoreDataFromResource(SAMPLE_DATA, LICENCE_FOR_TESTING);
+        backdoor.restoreDataFromResource(SAMPLE_DATA);
     }
 
     @Test

jira-slack-server-integration/jira-slack-server-integration-plugin/src/test/java/it/com/atlassian/jira/plugins/slack/functional/UnfurlingFuncTest.java

@@ -10,7 +10,6 @@
 
 import java.util.List;
 
-import static com.atlassian.jira.testkit.client.util.TimeBombLicence.LICENCE_FOR_TESTING;
 import static com.atlassian.plugins.slack.test.RequestMatchers.hasHit;
 import static com.atlassian.plugins.slack.test.RequestMatchers.requestEntityProperty;
 import static com.github.seratch.jslack.api.methods.Methods.CHAT_UNFURL;
@@ -23,7 +22,7 @@
 public class UnfurlingFuncTest extends SlackFunctionalTestBase {
     @Before
     public void beforeEach() {
-        backdoor.restoreDataFromResource(SAMPLE_DATA, LICENCE_FOR_TESTING);
+        backdoor.restoreDataFromResource(SAMPLE_DATA);
     }
 
     @Test

jira-slack-server-integration/jira-slack-server-integration-plugin/src/test/java/it/com/atlassian/jira/plugins/slack/functional/UserLinkFuncTest.java

@@ -6,7 +6,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static com.atlassian.jira.testkit.client.util.TimeBombLicence.LICENCE_FOR_TESTING;
 import static com.atlassian.plugins.slack.test.TestTeams.DUMMY_TEAM_ID;
 import static it.com.atlassian.jira.plugins.slack.util.JiraFuncTestData.SAMPLE_DATA;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -16,7 +15,7 @@
 public class UserLinkFuncTest extends SlackFunctionalTestBase {
     @Before
     public void beforeEach() {
-        backdoor.restoreDataFromResource(SAMPLE_DATA, LICENCE_FOR_TESTING);
+        backdoor.restoreDataFromResource(SAMPLE_DATA);
     }
 
     @Test

jira-slack-server-integration/jira-slack-server-integration-plugin/src/test/java/it/com/atlassian/jira/plugins/slack/functional/WorkspaceLinkFuncTest.java

@@ -6,7 +6,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static com.atlassian.jira.testkit.client.util.TimeBombLicence.LICENCE_FOR_TESTING;
 import static com.atlassian.plugins.slack.test.RequestMatchers.body;
 import static com.atlassian.plugins.slack.test.RequestMatchers.hasHit;
 import static com.atlassian.plugins.slack.test.RequestMatchers.request;
@@ -24,7 +23,7 @@
 public class WorkspaceLinkFuncTest extends SlackFunctionalTestBase {
     @Before
     public void beforeEach() {
-        backdoor.restoreDataFromResource(SAMPLE_DATA, LICENCE_FOR_TESTING);
+        backdoor.restoreDataFromResource(SAMPLE_DATA);
     }
 
     @Test

jira-slack-server-integration/jira-slack-server-integration-plugin/src/test/java/it/com/atlassian/jira/plugins/slack/web/ConfigurationWebTest.java

@@ -19,7 +19,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import static com.atlassian.jira.testkit.client.util.TimeBombLicence.LICENCE_FOR_TESTING;
 import static com.atlassian.plugins.slack.test.RequestMatchers.hasHit;
 import static com.atlassian.plugins.slack.test.RequestMatchers.requestEntityProperty;
 import static com.atlassian.plugins.slack.test.TestChannels.PUBLIC;
@@ -44,7 +43,7 @@ public class ConfigurationWebTest extends SlackWebTestBase {
 
     @Before
     public void beforeEach() {
-        backdoor.restoreDataFromResource(SAMPLE_DATA, LICENCE_FOR_TESTING);
+        backdoor.restoreDataFromResource(SAMPLE_DATA);
         flakyWebTestKiller.disableJiraFlags();
         connectToDummyTeamAndConfirmAdminAccount();
     }