Merge PR jenkinsci#101 Set test connection message color

correctly. Conflicts Resolved: src/main/java/jenkins/plugins/slack/SlackNotifier.java
chEbba · May 31, 2015 · 5ac4c40 · 5ac4c40
2 parents e1892ec + e95b66d
commit 5ac4c40
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/jenkins/plugins/slack/SlackNotifier.java b/src/main/java/jenkins/plugins/slack/SlackNotifier.java
@@ -316,7 +316,7 @@ public FormValidation doTestConnection(@QueryParameter("slackTeamDomain") final
                 }
                 SlackService testSlackService = getSlackService(targetDomain, targetToken, targetRoom);
                 String message = "Slack/Jenkins plugin: you're all set on " + targetBuildServerUrl;
-                boolean success = testSlackService.publish(message, "green");
+                boolean success = testSlackService.publish(message, "good");
                 return success ? FormValidation.ok("Success") : FormValidation.error("Failure");
             } catch (Exception e) {
                 return FormValidation.error("Client error : " + e.getMessage());