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:
committed by
GitHub
parent
f1faf603b0
commit
22bfd0c83e
@@ -29,30 +29,34 @@ func TestCreateMr(t *testing.T) {
|
||||
}
|
||||
t.Run("Creates an MR", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPost, "/create_mr", testCreateMrRequestData)
|
||||
svc := mergeRequestCreatorService{testProjectData, fakeMergeCreatorClient{}}
|
||||
svc := middleware(
|
||||
mergeRequestCreatorService{testProjectData, fakeMergeCreatorClient{}},
|
||||
withPayloadValidation(methodToPayload{http.MethodPost: &CreateMrRequest{}}),
|
||||
withMethodCheck(http.MethodPost),
|
||||
)
|
||||
data := getSuccessData(t, svc, request)
|
||||
assert(t, data.Message, "MR 'Some title' created")
|
||||
assert(t, data.Status, http.StatusOK)
|
||||
})
|
||||
|
||||
t.Run("Disallows non-POST methods", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodGet, "/create_mr", testCreateMrRequestData)
|
||||
svc := mergeRequestCreatorService{testProjectData, fakeMergeCreatorClient{}}
|
||||
data := getFailData(t, svc, request)
|
||||
checkBadMethod(t, data, http.MethodPost)
|
||||
})
|
||||
|
||||
t.Run("Handles errors from Gitlab client", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPost, "/create_mr", testCreateMrRequestData)
|
||||
svc := mergeRequestCreatorService{testProjectData, fakeMergeCreatorClient{testBase{errFromGitlab: true}}}
|
||||
data := getFailData(t, svc, request)
|
||||
svc := middleware(
|
||||
mergeRequestCreatorService{testProjectData, fakeMergeCreatorClient{testBase{errFromGitlab: true}}},
|
||||
withPayloadValidation(methodToPayload{http.MethodPost: &CreateMrRequest{}}),
|
||||
withMethodCheck(http.MethodPost),
|
||||
)
|
||||
data, _ := getFailData(t, svc, request)
|
||||
checkErrorFromGitlab(t, data, "Could not create MR")
|
||||
})
|
||||
|
||||
t.Run("Handles non-200s from Gitlab client", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPost, "/create_mr", testCreateMrRequestData)
|
||||
svc := mergeRequestCreatorService{testProjectData, fakeMergeCreatorClient{testBase{status: http.StatusSeeOther}}}
|
||||
data := getFailData(t, svc, request)
|
||||
svc := middleware(
|
||||
mergeRequestCreatorService{testProjectData, fakeMergeCreatorClient{testBase{status: http.StatusSeeOther}}},
|
||||
withPayloadValidation(methodToPayload{http.MethodPost: &CreateMrRequest{}}),
|
||||
withMethodCheck(http.MethodPost),
|
||||
)
|
||||
data, _ := getFailData(t, svc, request)
|
||||
checkNon200(t, data, "Could not create MR", "/create_mr")
|
||||
})
|
||||
|
||||
@@ -60,21 +64,27 @@ func TestCreateMr(t *testing.T) {
|
||||
reqData := testCreateMrRequestData
|
||||
reqData.Title = ""
|
||||
request := makeRequest(t, http.MethodPost, "/create_mr", reqData)
|
||||
svc := mergeRequestCreatorService{testProjectData, fakeMergeCreatorClient{}}
|
||||
data := getFailData(t, svc, request)
|
||||
assert(t, data.Status, http.StatusBadRequest)
|
||||
assert(t, data.Message, "Could not create MR")
|
||||
assert(t, data.Details, "Title cannot be empty")
|
||||
svc := middleware(
|
||||
mergeRequestCreatorService{testProjectData, fakeMergeCreatorClient{}},
|
||||
withPayloadValidation(methodToPayload{http.MethodPost: &CreateMrRequest{}}),
|
||||
withMethodCheck(http.MethodPost),
|
||||
)
|
||||
data, _ := getFailData(t, svc, request)
|
||||
assert(t, data.Message, "Invalid payload")
|
||||
assert(t, data.Details, "Title is required")
|
||||
})
|
||||
|
||||
t.Run("Handles missing target branch", func(t *testing.T) {
|
||||
reqData := testCreateMrRequestData
|
||||
reqData.TargetBranch = ""
|
||||
request := makeRequest(t, http.MethodPost, "/create_mr", reqData)
|
||||
svc := mergeRequestCreatorService{testProjectData, fakeMergeCreatorClient{}}
|
||||
data := getFailData(t, svc, request)
|
||||
assert(t, data.Status, http.StatusBadRequest)
|
||||
assert(t, data.Message, "Could not create MR")
|
||||
assert(t, data.Details, "Target branch cannot be empty")
|
||||
svc := middleware(
|
||||
mergeRequestCreatorService{testProjectData, fakeMergeCreatorClient{}},
|
||||
withPayloadValidation(methodToPayload{http.MethodPost: &CreateMrRequest{}}),
|
||||
withMethodCheck(http.MethodPost),
|
||||
)
|
||||
data, _ := getFailData(t, svc, request)
|
||||
assert(t, data.Message, "Invalid payload")
|
||||
assert(t, data.Details, "TargetBranch is required")
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user