22bfd0c83e
fix: format of date when MR was closed or merged (#367) refactor: Add Payload Validators + Middleware In Go Code (#366) fix: Add better checks for leaving comments (#369) fix: regex support for http credentials embedded in remote url (#372) fix: Comment on single line selects two lines (#371) This is a #PATCH release.
65 lines
2.3 KiB
Go
65 lines
2.3 KiB
Go
package app
|
|
|
|
import (
|
|
"net/http"
|
|
"testing"
|
|
|
|
"github.com/xanzy/go-gitlab"
|
|
)
|
|
|
|
type fakeMergeRequestAccepter struct {
|
|
testBase
|
|
}
|
|
|
|
func (f fakeMergeRequestAccepter) AcceptMergeRequest(pid interface{}, mergeRequest int, opt *gitlab.AcceptMergeRequestOptions, options ...gitlab.RequestOptionFunc) (*gitlab.MergeRequest, *gitlab.Response, error) {
|
|
resp, err := f.handleGitlabError()
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
return &gitlab.MergeRequest{}, resp, err
|
|
}
|
|
|
|
func TestAcceptAndMergeHandler(t *testing.T) {
|
|
var testAcceptMergeRequestPayload = AcceptMergeRequestRequest{Squash: false, SquashMessage: "Squash me!", DeleteBranch: false}
|
|
t.Run("Accepts and merges a merge request", func(t *testing.T) {
|
|
request := makeRequest(t, http.MethodPost, "/mr/merge", testAcceptMergeRequestPayload)
|
|
svc := middleware(
|
|
mergeRequestAccepterService{testProjectData, fakeMergeRequestAccepter{}},
|
|
withMr(testProjectData, fakeMergeRequestLister{}),
|
|
withPayloadValidation(methodToPayload{
|
|
http.MethodPost: &AcceptMergeRequestRequest{},
|
|
}),
|
|
withMethodCheck(http.MethodPost),
|
|
)
|
|
data := getSuccessData(t, svc, request)
|
|
assert(t, data.Message, "MR merged successfully")
|
|
})
|
|
t.Run("Handles errors from Gitlab client", func(t *testing.T) {
|
|
request := makeRequest(t, http.MethodPost, "/mr/merge", testAcceptMergeRequestPayload)
|
|
svc := middleware(
|
|
mergeRequestAccepterService{testProjectData, fakeMergeRequestAccepter{testBase{errFromGitlab: true}}},
|
|
withMr(testProjectData, fakeMergeRequestLister{}),
|
|
withPayloadValidation(methodToPayload{
|
|
http.MethodPost: &AcceptMergeRequestRequest{},
|
|
}),
|
|
withMethodCheck(http.MethodPost),
|
|
)
|
|
data, _ := getFailData(t, svc, request)
|
|
checkErrorFromGitlab(t, data, "Could not merge MR")
|
|
})
|
|
t.Run("Handles non-200s from Gitlab", func(t *testing.T) {
|
|
request := makeRequest(t, http.MethodPost, "/mr/merge", testAcceptMergeRequestPayload)
|
|
svc := middleware(
|
|
mergeRequestAccepterService{testProjectData, fakeMergeRequestAccepter{testBase{status: http.StatusSeeOther}}},
|
|
withMr(testProjectData, fakeMergeRequestLister{}),
|
|
withPayloadValidation(methodToPayload{
|
|
http.MethodPost: &AcceptMergeRequestRequest{},
|
|
}),
|
|
withMethodCheck(http.MethodPost),
|
|
)
|
|
data, _ := getFailData(t, svc, request)
|
|
checkNon200(t, data, "Could not merge MR", "/mr/merge")
|
|
})
|
|
}
|