test: webhook fix branch filter tests
This commit is contained in:
parent
79ffb2de47
commit
79380c209d
2 changed files with 45 additions and 23 deletions
|
@ -29,8 +29,9 @@
|
||||||
-
|
-
|
||||||
id: 4
|
id: 4
|
||||||
repo_id: 2
|
repo_id: 2
|
||||||
|
type: gitea
|
||||||
url: http://www.example.com/url4
|
url: http://www.example.com/url4
|
||||||
http_method: POST
|
http_method: POST
|
||||||
content_type: 1 # json
|
content_type: 1 # json
|
||||||
events: '{"push_only":true,"branch_filter":"{master,feature*}"}'
|
events: '{"send_everything":true,"branch_filter":"{master,feature*}"}'
|
||||||
is_active: false
|
is_active: false
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
package webhook
|
package webhook
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"code.gitea.io/gitea/models/db"
|
"code.gitea.io/gitea/models/db"
|
||||||
|
@ -41,38 +42,58 @@ func TestPrepareWebhooks(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func eventType(p api.Payloader) webhook_module.HookEventType {
|
||||||
|
switch p.(type) {
|
||||||
|
case *api.CreatePayload:
|
||||||
|
return webhook_module.HookEventCreate
|
||||||
|
case *api.DeletePayload:
|
||||||
|
return webhook_module.HookEventDelete
|
||||||
|
case *api.PushPayload:
|
||||||
|
return webhook_module.HookEventPush
|
||||||
|
}
|
||||||
|
panic(fmt.Sprintf("no event type for payload %T", p))
|
||||||
|
}
|
||||||
|
|
||||||
func TestPrepareWebhooksBranchFilterMatch(t *testing.T) {
|
func TestPrepareWebhooksBranchFilterMatch(t *testing.T) {
|
||||||
assert.NoError(t, unittest.PrepareTestDatabase())
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
||||||
|
|
||||||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
|
// branch_filter: {master,feature*}
|
||||||
activateWebhook(t, 4)
|
w := unittest.AssertExistsAndLoadBean(t, &webhook_model.Webhook{ID: 4})
|
||||||
|
activateWebhook(t, w.ID)
|
||||||
|
|
||||||
hookTasks := []*webhook_model.HookTask{
|
for _, p := range []api.Payloader{
|
||||||
{HookID: 4, EventType: webhook_module.HookEventPush},
|
&api.PushPayload{Ref: "refs/heads/feature/7791"},
|
||||||
}
|
&api.CreatePayload{Ref: "refs/heads/feature/7791"}, // branch creation
|
||||||
for _, hookTask := range hookTasks {
|
&api.DeletePayload{Ref: "refs/heads/feature/7791"}, // branch deletion
|
||||||
unittest.AssertNotExistsBean(t, hookTask)
|
} {
|
||||||
}
|
t.Run(fmt.Sprintf("%T", p), func(t *testing.T) {
|
||||||
// this test also ensures that * doesn't handle / in any special way (like shell would)
|
db.DeleteBeans(db.DefaultContext, webhook_model.HookTask{HookID: w.ID})
|
||||||
assert.NoError(t, PrepareWebhooks(db.DefaultContext, EventSource{Repository: repo}, webhook_module.HookEventPush, &api.PushPayload{Ref: "refs/heads/feature/7791", Commits: []*api.PayloadCommit{{}}}))
|
typ := eventType(p)
|
||||||
for _, hookTask := range hookTasks {
|
assert.NoError(t, PrepareWebhook(db.DefaultContext, w, typ, p))
|
||||||
unittest.AssertExistsAndLoadBean(t, hookTask)
|
unittest.AssertExistsAndLoadBean(t, &webhook_model.HookTask{
|
||||||
|
HookID: w.ID,
|
||||||
|
EventType: typ,
|
||||||
|
})
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestPrepareWebhooksBranchFilterNoMatch(t *testing.T) {
|
func TestPrepareWebhooksBranchFilterNoMatch(t *testing.T) {
|
||||||
assert.NoError(t, unittest.PrepareTestDatabase())
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
||||||
|
|
||||||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
|
// branch_filter: {master,feature*}
|
||||||
hookTasks := []*webhook_model.HookTask{
|
w := unittest.AssertExistsAndLoadBean(t, &webhook_model.Webhook{ID: 4})
|
||||||
{HookID: 4, EventType: webhook_module.HookEventPush},
|
activateWebhook(t, w.ID)
|
||||||
}
|
|
||||||
for _, hookTask := range hookTasks {
|
|
||||||
unittest.AssertNotExistsBean(t, hookTask)
|
|
||||||
}
|
|
||||||
assert.NoError(t, PrepareWebhooks(db.DefaultContext, EventSource{Repository: repo}, webhook_module.HookEventPush, &api.PushPayload{Ref: "refs/heads/fix_weird_bug"}))
|
|
||||||
|
|
||||||
for _, hookTask := range hookTasks {
|
for _, p := range []api.Payloader{
|
||||||
unittest.AssertNotExistsBean(t, hookTask)
|
&api.PushPayload{Ref: "refs/heads/fix_weird_bug"},
|
||||||
|
&api.CreatePayload{Ref: "refs/heads/fix_weird_bug"}, // branch creation
|
||||||
|
&api.DeletePayload{Ref: "refs/heads/fix_weird_bug"}, // branch deletion
|
||||||
|
} {
|
||||||
|
t.Run(fmt.Sprintf("%T", p), func(t *testing.T) {
|
||||||
|
db.DeleteBeans(db.DefaultContext, webhook_model.HookTask{HookID: w.ID})
|
||||||
|
assert.NoError(t, PrepareWebhook(db.DefaultContext, w, eventType(p), p))
|
||||||
|
unittest.AssertNotExistsBean(t, &webhook_model.HookTask{HookID: w.ID})
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue