Merge pull request #664 from compressed/slack_fix

swap url and linktext positions for slack
harness · Nov 5, 2014 · 08837bb · 08837bb
2 parents 91ca5fe + 2269862
commit 08837bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plugin/notify/slack.go b/plugin/notify/slack.go
@@ -42,7 +42,7 @@ func (s *Slack) getMessage(context *model.Request, message string) string {
  // drone/drone#3333333
  linktext := context.Repo.Owner + "/" + context.Repo.Name + "#" + context.Commit.ShaShort()
 
- return fmt.Sprintf(message, linktext, url, context.Commit.Branch, context.Commit.Author)
+ return fmt.Sprintf(message, url, linktext, context.Commit.Branch, context.Commit.Author)
 }
 
 func (s *Slack) sendStarted(context *model.Request) error {

diff --git a/plugin/notify/slack_test.go b/plugin/notify/slack_test.go
@@ -23,7 +23,7 @@ var request = &model.Request{
 }
 */
 
-var slackExpectedLink = "<owner/repo#abc|http:https://examplehost.com/examplegit.com/owner/repo/example/abc>"
+var slackExpectedLink = "<http:https://examplehost.com/examplegit.com/owner/repo/example/abc|owner/repo#abc>"
 var slackExpectedBase = slackExpectedLink + " (example) by Test User"
 
 func Test_slackStartedMessage(t *testing.T) {