mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-05-18 16:28:20 +00:00
Code Issues Projects Releases Wiki Activity

Fix correctly handle gitlab pr closed events (#3362)

Browse source 
closes #3355
This commit is contained in:
Anbraten 2024-02-09 16:49:04 +01:00 committed by GitHub
parent caa95bd762
commit 9e96c9c25e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/forge/gitlab/convert.go
View file

@ -112,7 +112,7 @@ func convertMergeRequestHook(hook *gitlab.MergeEvent, req *http.Request) (int, *
}
pipeline.Event = model.EventPull
if obj.State == "closed" {
if obj.State == "closed" || obj.State == "merged" {
pipeline.Event = model.EventPullClosed
}

14
server/forge/gitlab/gitlab_test.go
View file

@ -156,6 +156,7 @@ func Test_GitLab(t *testing.T) {
assert.Equal(t, "develop", hookRepo.Branch)
assert.Equal(t, "refs/heads/main", pipeline.Ref)
assert.Equal(t, []string{"cmd/cli/main.go"}, pipeline.ChangedFiles)
assert.Equal(t, model.EventPush, pipeline.Event)
}
})
})
@ -178,6 +179,7 @@ func Test_GitLab(t *testing.T) {
assert.Equal(t, "develop", hookRepo.Branch)
assert.Equal(t, "refs/tags/v22", pipeline.Ref)
assert.Len(t, pipeline.ChangedFiles, 0)
assert.Equal(t, model.EventTag, pipeline.Event)
}
})
})
@ -201,6 +203,7 @@ func Test_GitLab(t *testing.T) {
assert.Equal(t, "woodpecker", hookRepo.Name)
assert.Equal(t, "Update client.go 🎉", pipeline.Title)
assert.Len(t, pipeline.ChangedFiles, 0) // see L217
assert.Equal(t, model.EventPull, pipeline.Event)
}
})
@ -251,6 +254,7 @@ func Test_GitLab(t *testing.T) {
assert.Equal(t, "woodpecker-test", hookRepo.Name)
assert.Equal(t, "Add new file", pipeline.Title)
assert.Len(t, pipeline.ChangedFiles, 0) // see L217
assert.Equal(t, model.EventPullClosed, pipeline.Event)
}
})
@ -271,6 +275,7 @@ func Test_GitLab(t *testing.T) {
assert.Equal(t, "woodpecker-test", hookRepo.Name)
assert.Equal(t, "Add new file", pipeline.Title)
assert.Len(t, pipeline.ChangedFiles, 0) // see L217
assert.Equal(t, model.EventPullClosed, pipeline.Event)
}
})
@ -282,12 +287,13 @@ func Test_GitLab(t *testing.T) {
)
req.Header = testdata.ReleaseHookHeaders
hookRepo, build, err := client.Hook(ctx, req)
hookRepo, pipeline, err := client.Hook(ctx, req)
assert.NoError(t, err)
if assert.NotNil(t, hookRepo) && assert.NotNil(t, build) {
assert.Equal(t, "refs/tags/0.0.2", build.Ref)
if assert.NotNil(t, hookRepo) && assert.NotNil(t, pipeline) {
assert.Equal(t, "refs/tags/0.0.2", pipeline.Ref)
assert.Equal(t, "ci", hookRepo.Name)
assert.Equal(t, "created release Awesome version 0.0.2", build.Message)
assert.Equal(t, "created release Awesome version 0.0.2", pipeline.Message)
assert.Equal(t, model.EventRelease, pipeline.Event)
}
})
})