From b833b16f32b4879898fa9edbca936223c3d12d73 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Tue, 20 Jun 2017 23:53:47 -0500 Subject: [PATCH] add missing Email from Hook Event in gitea. (#2080) * add missing Email from Hook Event in gitea. Signed-off-by: Bo-Yi Wu * fix field. Signed-off-by: Bo-Yi Wu * fix avatar path Signed-off-by: Bo-Yi Wu * fix testing Signed-off-by: Bo-Yi Wu --- remote/gitea/fixtures/hooks.go | 4 +++- remote/gitea/helper.go | 1 + remote/gitea/helper_test.go | 2 ++ remote/gogs/helper.go | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/remote/gitea/fixtures/hooks.go b/remote/gitea/fixtures/hooks.go index b8ab4d6ad..0765a8c07 100644 --- a/remote/gitea/fixtures/hooks.go +++ b/remote/gitea/fixtures/hooks.go @@ -39,11 +39,13 @@ const HookPush = ` "pusher": { "name": "gordon", "email": "gordon@golang.org", - "username": "gordon" + "username": "gordon", + "login": "gordon" }, "sender": { "login": "gordon", "id": 1, + "username": "gordon", "avatar_url": "http://gitea.golang.org///1.gravatar.com/avatar/8c58a0be77ee441bb8f8595b7f1b4e87" } } diff --git a/remote/gitea/helper.go b/remote/gitea/helper.go index 199e8ce2a..e0674dc8a 100644 --- a/remote/gitea/helper.go +++ b/remote/gitea/helper.go @@ -88,6 +88,7 @@ func buildFromPush(hook *pushHook) *model.Build { Message: hook.Commits[0].Message, Avatar: avatar, Author: author, + Email: hook.Pusher.Email, Timestamp: time.Now().UTC().Unix(), Sender: sender, } diff --git a/remote/gitea/helper_test.go b/remote/gitea/helper_test.go index 1bacc15f3..fa1332cb1 100644 --- a/remote/gitea/helper_test.go +++ b/remote/gitea/helper_test.go @@ -33,7 +33,9 @@ func Test_parse(t *testing.T) { g.Assert(hook.Pusher.Name).Equal("gordon") g.Assert(hook.Pusher.Email).Equal("gordon@golang.org") g.Assert(hook.Pusher.Username).Equal("gordon") + g.Assert(hook.Pusher.Login).Equal("gordon") g.Assert(hook.Sender.Login).Equal("gordon") + g.Assert(hook.Sender.Username).Equal("gordon") g.Assert(hook.Sender.Avatar).Equal("http://gitea.golang.org///1.gravatar.com/avatar/8c58a0be77ee441bb8f8595b7f1b4e87") }) diff --git a/remote/gogs/helper.go b/remote/gogs/helper.go index 1570c23b6..e85ba780e 100644 --- a/remote/gogs/helper.go +++ b/remote/gogs/helper.go @@ -88,6 +88,7 @@ func buildFromPush(hook *pushHook) *model.Build { Message: hook.Commits[0].Message, Avatar: avatar, Author: author, + Email: hook.Pusher.Email, Timestamp: time.Now().UTC().Unix(), Sender: sender, }