fix: date fixes; go middleware refactors; regex fixes; etc (#368)

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.
This commit is contained in:
Harrison (Harry) Cramer
2024-09-14 16:53:00 -04:00
committed by GitHub
parent f1faf603b0
commit 22bfd0c83e
61 changed files with 1527 additions and 1284 deletions

View File

@@ -10,6 +10,7 @@ import (
type fakeMergeRequestLister struct {
testBase
emptyResponse bool
multipleMrs bool
}
func (f fakeMergeRequestLister) ListProjectMergeRequests(pid interface{}, opt *gitlab.ListProjectMergeRequestsOptions, options ...gitlab.RequestOptionFunc) ([]*gitlab.MergeRequest, *gitlab.Response, error) {
@@ -22,6 +23,10 @@ func (f fakeMergeRequestLister) ListProjectMergeRequests(pid interface{}, opt *g
return []*gitlab.MergeRequest{}, resp, err
}
if f.multipleMrs {
return []*gitlab.MergeRequest{{IID: 10}, {IID: 11}}, resp, err
}
return []*gitlab.MergeRequest{{IID: 10}}, resp, err
}
@@ -29,30 +34,45 @@ func TestMergeRequestHandler(t *testing.T) {
var testListMergeRequestsRequest = gitlab.ListProjectMergeRequestsOptions{}
t.Run("Should fetch merge requests", func(t *testing.T) {
request := makeRequest(t, http.MethodPost, "/merge_requests", testListMergeRequestsRequest)
svc := mergeRequestListerService{testProjectData, fakeMergeRequestLister{}}
svc := middleware(
mergeRequestListerService{testProjectData, fakeMergeRequestLister{}},
withPayloadValidation(methodToPayload{http.MethodPost: &gitlab.ListProjectMergeRequestsOptions{}}),
withMethodCheck(http.MethodPost),
)
data := getSuccessData(t, svc, request)
assert(t, data.Status, http.StatusOK)
assert(t, data.Message, "Merge requests fetched successfully")
})
t.Run("Handles error from Gitlab client", func(t *testing.T) {
request := makeRequest(t, http.MethodPost, "/merge_requests", testListMergeRequestsRequest)
svc := mergeRequestListerService{testProjectData, fakeMergeRequestLister{testBase: testBase{errFromGitlab: true}}}
data := getFailData(t, svc, request)
svc := middleware(
mergeRequestListerService{testProjectData, fakeMergeRequestLister{testBase: testBase{errFromGitlab: true}}},
withPayloadValidation(methodToPayload{http.MethodPost: &gitlab.ListProjectMergeRequestsOptions{}}),
withMethodCheck(http.MethodPost),
)
data, status := getFailData(t, svc, request)
checkErrorFromGitlab(t, data, "Failed to list merge requests")
assert(t, data.Status, http.StatusInternalServerError)
assert(t, status, http.StatusInternalServerError)
})
t.Run("Handles non-200s from Gitlab client", func(t *testing.T) {
request := makeRequest(t, http.MethodPost, "/merge_requests", testListMergeRequestsRequest)
svc := mergeRequestListerService{testProjectData, fakeMergeRequestLister{testBase: testBase{status: http.StatusSeeOther}}}
data := getFailData(t, svc, request)
svc := middleware(
mergeRequestListerService{testProjectData, fakeMergeRequestLister{testBase: testBase{status: http.StatusSeeOther}}},
withPayloadValidation(methodToPayload{http.MethodPost: &gitlab.ListProjectMergeRequestsOptions{}}),
withMethodCheck(http.MethodPost),
)
data, status := getFailData(t, svc, request)
checkNon200(t, data, "Failed to list merge requests", "/merge_requests")
assert(t, data.Status, http.StatusSeeOther)
assert(t, status, http.StatusSeeOther)
})
t.Run("Should handle not having any merge requests with 404", func(t *testing.T) {
request := makeRequest(t, http.MethodPost, "/merge_requests", testListMergeRequestsRequest)
svc := mergeRequestListerService{testProjectData, fakeMergeRequestLister{emptyResponse: true}}
data := getFailData(t, svc, request)
svc := middleware(
mergeRequestListerService{testProjectData, fakeMergeRequestLister{emptyResponse: true}},
withPayloadValidation(methodToPayload{http.MethodPost: &gitlab.ListProjectMergeRequestsOptions{}}),
withMethodCheck(http.MethodPost),
)
data, status := getFailData(t, svc, request)
assert(t, data.Message, "No merge requests found")
assert(t, data.Status, http.StatusNotFound)
assert(t, status, http.StatusNotFound)
})
}