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
@@ -14,9 +14,9 @@ type fakeTraceFileGetter struct {
|
||||
testBase
|
||||
}
|
||||
|
||||
func getTraceFileData(t *testing.T, svc ServiceWithHandler, request *http.Request) JobTraceResponse {
|
||||
func getTraceFileData(t *testing.T, svc http.Handler, request *http.Request) JobTraceResponse {
|
||||
res := httptest.NewRecorder()
|
||||
svc.handler(res, request)
|
||||
svc.ServeHTTP(res, request)
|
||||
|
||||
var data JobTraceResponse
|
||||
err := json.Unmarshal(res.Body.Bytes(), &data)
|
||||
@@ -35,37 +35,37 @@ func (f fakeTraceFileGetter) GetTraceFile(pid interface{}, jobID int, options ..
|
||||
return re, resp, err
|
||||
}
|
||||
|
||||
// var jobId = 0
|
||||
func TestJobHandler(t *testing.T) {
|
||||
t.Run("Should read a job trace file", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodGet, "/job", JobTraceRequest{})
|
||||
client := fakeTraceFileGetter{}
|
||||
svc := traceFileService{testProjectData, client}
|
||||
request := makeRequest(t, http.MethodGet, "/job", JobTraceRequest{JobId: 3})
|
||||
svc := middleware(
|
||||
traceFileService{testProjectData, fakeTraceFileGetter{}},
|
||||
withPayloadValidation(methodToPayload{http.MethodGet: &JobTraceRequest{}}),
|
||||
withMethodCheck(http.MethodGet),
|
||||
)
|
||||
data := getTraceFileData(t, svc, request)
|
||||
assert(t, data.Message, "Log file read")
|
||||
assert(t, data.Status, http.StatusOK)
|
||||
assert(t, data.File, "Some data")
|
||||
})
|
||||
t.Run("Disallows non-GET methods", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPost, "/job", JobTraceRequest{})
|
||||
client := fakeTraceFileGetter{}
|
||||
svc := traceFileService{testProjectData, client}
|
||||
data := getFailData(t, svc, request)
|
||||
checkBadMethod(t, data, http.MethodGet)
|
||||
})
|
||||
t.Run("Handles errors from Gitlab client", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodGet, "/job", JobTraceRequest{})
|
||||
client := fakeTraceFileGetter{testBase{errFromGitlab: true}}
|
||||
svc := traceFileService{testProjectData, client}
|
||||
data := getFailData(t, svc, request)
|
||||
request := makeRequest(t, http.MethodGet, "/job", JobTraceRequest{JobId: 2})
|
||||
svc := middleware(
|
||||
traceFileService{testProjectData, fakeTraceFileGetter{testBase{errFromGitlab: true}}},
|
||||
withPayloadValidation(methodToPayload{http.MethodGet: &JobTraceRequest{}}),
|
||||
withMethodCheck(http.MethodGet),
|
||||
)
|
||||
data, _ := getFailData(t, svc, request)
|
||||
checkErrorFromGitlab(t, data, "Could not get trace file for job")
|
||||
})
|
||||
|
||||
t.Run("Handles non-200s from Gitlab client", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodGet, "/job", JobTraceRequest{})
|
||||
client := fakeTraceFileGetter{testBase{status: http.StatusSeeOther}}
|
||||
svc := traceFileService{testProjectData, client}
|
||||
data := getFailData(t, svc, request)
|
||||
request := makeRequest(t, http.MethodGet, "/job", JobTraceRequest{JobId: 1})
|
||||
svc := middleware(
|
||||
traceFileService{testProjectData, fakeTraceFileGetter{testBase{status: http.StatusSeeOther}}},
|
||||
withPayloadValidation(methodToPayload{http.MethodGet: &JobTraceRequest{}}),
|
||||
withMethodCheck(http.MethodGet),
|
||||
)
|
||||
data, _ := getFailData(t, svc, request)
|
||||
checkNon200(t, data, "Could not get trace file for job", "/job")
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user