refactor(message): update default message

This commit is contained in:
Bo-Yi Wu 2019-02-17 15:44:29 +08:00
parent 861d6e1adb
commit 4d2a304048
2 changed files with 32 additions and 8 deletions

View File

@ -220,7 +220,7 @@ func (p Plugin) Exec() error {
if len(p.Config.Message) > 0 { if len(p.Config.Message) > 0 {
message = p.Config.Message message = p.Config.Message
} else { } else {
message = p.Message(p.Repo, p.Commit, p.Build) message = p.Message()
} }
bot, err := tgbotapi.NewBotAPI(p.Config.Token) bot, err := tgbotapi.NewBotAPI(p.Config.Token)
@ -369,12 +369,12 @@ func (p Plugin) Send(bot *tgbotapi.BotAPI, msg tgbotapi.Chattable) error {
} }
// Message is plugin default message. // Message is plugin default message.
func (p Plugin) Message(repo Repo, commit Commit, build Build) []string { func (p Plugin) Message() []string {
return []string{fmt.Sprintf("[%s] <%s> (%s)『%s』by %s", return []string{fmt.Sprintf("[%s] <%s> (%s)『%s』by %s",
build.Status, p.Build.Status,
build.Link, p.Build.Link,
commit.Branch, p.Commit.Branch,
commit.Message, p.Commit.Message,
commit.Author, p.Commit.Author,
)} )}
} }

View File

@ -46,11 +46,35 @@ func TestDefaultMessageFormat(t *testing.T) {
}, },
} }
message := plugin.Message(plugin.Repo, plugin.Commit, plugin.Build) message := plugin.Message()
assert.Equal(t, []string{"[success] <https://github.com/appleboy/go-hello> (master)『update travis』by Bo-Yi Wu"}, message) assert.Equal(t, []string{"[success] <https://github.com/appleboy/go-hello> (master)『update travis』by Bo-Yi Wu"}, message)
} }
// func TestDefaultMessageFormatFromGitHub(t *testing.T) {
// plugin := Plugin{
// Repo: Repo{
// Name: "go-hello",
// Namespace: "appleboy",
// },
// Commit: Commit{
// Sha: "e7c4f0a63ceeb42a39ac7806f7b51f3f0d204fd2",
// Author: "Bo-Yi Wu",
// Branch: "master",
// Message: "update travis",
// },
// Build: Build{
// Number: 101,
// Status: "success",
// Link: "https://github.com/appleboy/go-hello",
// },
// }
// message := plugin.Message()
// assert.Equal(t, []string{"[success] <https://github.com/appleboy/go-hello> (master)『update travis』by Bo-Yi Wu"}, message)
// }
func TestSendMessage(t *testing.T) { func TestSendMessage(t *testing.T) {
plugin := Plugin{ plugin := Plugin{
Repo: Repo{ Repo: Repo{