Necessary changes for the jenkinsci#169 merge into master

KreAch3R · Jul 22, 2018 · dc448b8 · dc448b8
1 parent 10b03da
commit dc448b8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/main/java/jenkins/plugins/slack/ActiveNotifier.java b/src/main/java/jenkins/plugins/slack/ActiveNotifier.java
@@ -433,6 +433,21 @@ public MessageBuilder appendFailedTests() {
             return this;
         }
 
+        public MessageBuilder appendCustomMessage() {
+            String customMessage = notifier.getCustomMessage();
+            EnvVars envVars = new EnvVars();
+            try {
+                envVars = build.getEnvironment(new LogTaskListener(logger, INFO));
+            } catch (IOException e) {
+                logger.log(SEVERE, e.getMessage(), e);
+            } catch (InterruptedException e) {
+                logger.log(SEVERE, e.getMessage(), e);
+            }
+            message.append("\n");
+            message.append(envVars.expand(customMessage));
+            return this;
+        }
+
         public MessageBuilder appendCustomMessage(Result buildResult) {
             String customMessage = notifier.getCustomMessage(buildResult);
             EnvVars envVars = new EnvVars();

diff --git a/src/test/java/jenkins/plugins/slack/SlackNotifierTest.java b/src/test/java/jenkins/plugins/slack/SlackNotifierTest.java
@@ -46,7 +46,8 @@ public SlackNotifierTest(SlackServiceStub slackServiceStub, boolean response, Fo
         customMessageMap.put("ABORTED", "This is the Aborted Result Message");
         customMessageMap.put("FAILURE", "This is the Failure Result Message");
 
-        this.slackNotifier = new SlackNotifierStub( "teamDomain", "authToken", true, "room", "buildServerUrl", "sendAs", true, true, true, true, true, true, true, true, false, false, CommitInfoChoice.NONE, true, "Custom Message String", customMessageMap);
+        this.slackNotifier = new SlackNotifierStub("baseUrl", "teamDomain", "authToken", true, "room", "buildServerUrl", "sendAs", true, true,
+                true, true, true, true, false, true, true, false, false, CommitInfoChoice.NONE, true, "Custom Message String", customMessageMap);
     }
 
     @Parameterized.Parameters