Add Filtering, HealthCheck, Better Tests (#350)
feat: add filtering when choosing merge requests (#346) feat: Add healthcheck (#345) refactor: Move to gomock (#349) feat: Makes the remote of the plugin configurable (#348) This is a #MINOR release.
This commit is contained in:
Harrison (Harry) Cramer
committed by
GitHub
GitHub
parent
aa5d3c1f52
commit
4ae623cd65
@@ -6,139 +6,176 @@ import (
|
||||
"testing"
|
||||
|
||||
"github.com/xanzy/go-gitlab"
|
||||
mock_main "gitlab.com/harrisoncramer/gitlab.nvim/cmd/mocks"
|
||||
"go.uber.org/mock/gomock"
|
||||
)
|
||||
|
||||
func createMergeRequestDiscussion(pid interface{}, mergeRequest int, opt *gitlab.CreateMergeRequestDiscussionOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Discussion, *gitlab.Response, error) {
|
||||
return &gitlab.Discussion{Notes: []*gitlab.Note{{}}}, makeResponse(http.StatusOK), nil
|
||||
var testCommentCreationData = PostCommentRequest{
|
||||
Comment: "Some comment",
|
||||
}
|
||||
|
||||
func createMergeRequestDiscussionNon200(pid interface{}, mergeRequest int, opt *gitlab.CreateMergeRequestDiscussionOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Discussion, *gitlab.Response, error) {
|
||||
return nil, makeResponse(http.StatusSeeOther), nil
|
||||
var testCommentDeletionData = DeleteCommentRequest{
|
||||
NoteId: 3,
|
||||
DiscussionId: "abc123",
|
||||
}
|
||||
|
||||
func createMergeRequestDiscussionErr(pid interface{}, mergeRequest int, opt *gitlab.CreateMergeRequestDiscussionOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Discussion, *gitlab.Response, error) {
|
||||
return nil, nil, errors.New("Some error from Gitlab")
|
||||
var testEditCommentData = EditCommentRequest{
|
||||
Comment: "Some comment",
|
||||
NoteId: 3,
|
||||
DiscussionId: "abc123",
|
||||
}
|
||||
|
||||
func TestPostComment(t *testing.T) {
|
||||
t.Run("Creates a new note (unlinked comment)", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPost, "/mr/comment", PostCommentRequest{})
|
||||
server, _ := createRouterAndApi(fakeClient{createMergeRequestDiscussion: createMergeRequestDiscussion})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().CreateMergeRequestDiscussion(
|
||||
"",
|
||||
mock_main.MergeId,
|
||||
gomock.Any(),
|
||||
).Return(&gitlab.Discussion{Notes: []*gitlab.Note{{}}}, makeResponse(http.StatusOK), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodPost, "/mr/comment", testCommentCreationData)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, CommentResponse{})
|
||||
|
||||
assert(t, data.SuccessResponse.Message, "Comment created successfully")
|
||||
assert(t, data.SuccessResponse.Status, http.StatusOK)
|
||||
})
|
||||
|
||||
t.Run("Creates a new comment", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPost, "/mr/comment", PostCommentRequest{
|
||||
// Re-create comment creation data to avoid mutating this variable in other tests
|
||||
testCommentCreationData := PostCommentRequest{
|
||||
Comment: "Some comment",
|
||||
PositionData: PositionData{
|
||||
FileName: "some_file.txt",
|
||||
FileName: "file.txt",
|
||||
},
|
||||
})
|
||||
server, _ := createRouterAndApi(fakeClient{createMergeRequestDiscussion: createMergeRequestDiscussion})
|
||||
data := serveRequest(t, server, request, CommentResponse{})
|
||||
assert(t, data.SuccessResponse.Message, "Comment created successfully")
|
||||
assert(t, data.SuccessResponse.Status, http.StatusOK)
|
||||
})
|
||||
}
|
||||
|
||||
t.Run("Creates a new multiline comment", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPost, "/mr/comment", PostCommentRequest{
|
||||
PositionData: PositionData{
|
||||
FileName: "some_file.txt",
|
||||
LineRange: &LineRange{
|
||||
StartRange: &LinePosition{}, /* These would have real data */
|
||||
EndRange: &LinePosition{},
|
||||
},
|
||||
},
|
||||
})
|
||||
server, _ := createRouterAndApi(fakeClient{createMergeRequestDiscussion: createMergeRequestDiscussion})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().CreateMergeRequestDiscussion(
|
||||
"",
|
||||
mock_main.MergeId,
|
||||
gomock.Any(),
|
||||
).Return(&gitlab.Discussion{Notes: []*gitlab.Note{{}}}, makeResponse(http.StatusOK), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodPost, "/mr/comment", testCommentCreationData)
|
||||
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, CommentResponse{})
|
||||
assert(t, data.SuccessResponse.Message, "Comment created successfully")
|
||||
assert(t, data.SuccessResponse.Status, http.StatusOK)
|
||||
})
|
||||
|
||||
t.Run("Handles errors from Gitlab client", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPost, "/mr/comment", PostCommentRequest{})
|
||||
server, _ := createRouterAndApi(fakeClient{createMergeRequestDiscussion: createMergeRequestDiscussionErr})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().CreateMergeRequestDiscussion(
|
||||
"",
|
||||
mock_main.MergeId,
|
||||
gomock.Any(),
|
||||
).Return(nil, nil, errors.New("Some error from Gitlab"))
|
||||
|
||||
request := makeRequest(t, http.MethodPost, "/mr/comment", testCommentCreationData)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
|
||||
checkErrorFromGitlab(t, *data, "Could not create discussion")
|
||||
})
|
||||
|
||||
t.Run("Handles non-200s from Gitlab", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPost, "/mr/comment", PostCommentRequest{})
|
||||
server, _ := createRouterAndApi(fakeClient{createMergeRequestDiscussion: createMergeRequestDiscussionNon200})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().CreateMergeRequestDiscussion(
|
||||
"",
|
||||
mock_main.MergeId,
|
||||
gomock.Any(),
|
||||
).Return(nil, makeResponse(http.StatusSeeOther), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodPost, "/mr/comment", testCommentCreationData)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
|
||||
checkNon200(t, *data, "Could not create discussion", "/mr/comment")
|
||||
})
|
||||
}
|
||||
|
||||
func deleteMergeRequestDiscussionNote(pid interface{}, mergeRequest int, discussion string, note int, options ...gitlab.RequestOptionFunc) (*gitlab.Response, error) {
|
||||
return makeResponse(http.StatusOK), nil
|
||||
}
|
||||
|
||||
func deleteMergeRequestDiscussionNoteErr(pid interface{}, mergeRequest int, discussion string, note int, options ...gitlab.RequestOptionFunc) (*gitlab.Response, error) {
|
||||
return nil, errors.New("Some error from Gitlab")
|
||||
}
|
||||
|
||||
func deleteMergeRequestDiscussionNoteNon200(pid interface{}, mergeRequest int, discussion string, note int, options ...gitlab.RequestOptionFunc) (*gitlab.Response, error) {
|
||||
return makeResponse(http.StatusSeeOther), nil
|
||||
}
|
||||
|
||||
func TestDeleteComment(t *testing.T) {
|
||||
t.Run("Deletes a comment", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodDelete, "/mr/comment", DeleteCommentRequest{})
|
||||
server, _ := createRouterAndApi(fakeClient{deleteMergeRequestDiscussionNote: deleteMergeRequestDiscussionNote})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().DeleteMergeRequestDiscussionNote("", mock_main.MergeId, testCommentDeletionData.DiscussionId, testCommentDeletionData.NoteId).Return(makeResponse(http.StatusOK), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodDelete, "/mr/comment", testCommentDeletionData)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, CommentResponse{})
|
||||
|
||||
assert(t, data.SuccessResponse.Message, "Comment deleted successfully")
|
||||
assert(t, data.SuccessResponse.Status, http.StatusOK)
|
||||
})
|
||||
|
||||
t.Run("Handles errors from Gitlab client", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodDelete, "/mr/comment", DeleteCommentRequest{})
|
||||
server, _ := createRouterAndApi(fakeClient{deleteMergeRequestDiscussionNote: deleteMergeRequestDiscussionNoteErr})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().DeleteMergeRequestDiscussionNote("", mock_main.MergeId, testCommentDeletionData.DiscussionId, testCommentDeletionData.NoteId).Return(nil, errorFromGitlab)
|
||||
|
||||
request := makeRequest(t, http.MethodDelete, "/mr/comment", testCommentDeletionData)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
|
||||
checkErrorFromGitlab(t, *data, "Could not delete comment")
|
||||
})
|
||||
|
||||
t.Run("Handles non-200s from Gitlab", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodDelete, "/mr/comment", DeleteCommentRequest{})
|
||||
server, _ := createRouterAndApi(fakeClient{deleteMergeRequestDiscussionNote: deleteMergeRequestDiscussionNoteNon200})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().DeleteMergeRequestDiscussionNote("", mock_main.MergeId, testCommentDeletionData.DiscussionId, testCommentDeletionData.NoteId).Return(makeResponse(http.StatusSeeOther), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodDelete, "/mr/comment", testCommentDeletionData)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
|
||||
checkNon200(t, *data, "Could not delete comment", "/mr/comment")
|
||||
})
|
||||
}
|
||||
|
||||
func updateMergeRequestDiscussionNote(pid interface{}, mergeRequest int, discussion string, note int, opt *gitlab.UpdateMergeRequestDiscussionNoteOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Note, *gitlab.Response, error) {
|
||||
return &gitlab.Note{}, makeResponse(http.StatusOK), nil
|
||||
}
|
||||
|
||||
func updateMergeRequestDiscussionNoteErr(pid interface{}, mergeRequest int, discussion string, note int, opt *gitlab.UpdateMergeRequestDiscussionNoteOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Note, *gitlab.Response, error) {
|
||||
return nil, nil, errors.New("Some error from Gitlab")
|
||||
}
|
||||
|
||||
func updateMergeRequestDiscussionNoteNon200(pid interface{}, mergeRequest int, discussion string, note int, opt *gitlab.UpdateMergeRequestDiscussionNoteOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Note, *gitlab.Response, error) {
|
||||
return nil, makeResponse(http.StatusSeeOther), nil
|
||||
}
|
||||
|
||||
func TestEditComment(t *testing.T) {
|
||||
t.Run("Edits a comment", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPatch, "/mr/comment", EditCommentRequest{})
|
||||
server, _ := createRouterAndApi(fakeClient{updateMergeRequestDiscussionNote: updateMergeRequestDiscussionNote})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
opts := gitlab.UpdateMergeRequestDiscussionNoteOptions{
|
||||
Body: gitlab.Ptr(testEditCommentData.Comment),
|
||||
}
|
||||
client.EXPECT().UpdateMergeRequestDiscussionNote("", mock_main.MergeId, testEditCommentData.DiscussionId, testEditCommentData.NoteId, &opts).Return(&gitlab.Note{}, makeResponse(http.StatusOK), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodPatch, "/mr/comment", testEditCommentData)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, CommentResponse{})
|
||||
|
||||
assert(t, data.SuccessResponse.Message, "Comment updated successfully")
|
||||
assert(t, data.SuccessResponse.Status, http.StatusOK)
|
||||
})
|
||||
|
||||
t.Run("Handles errors from Gitlab client", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPatch, "/mr/comment", EditCommentRequest{})
|
||||
server, _ := createRouterAndApi(fakeClient{updateMergeRequestDiscussionNote: updateMergeRequestDiscussionNoteErr})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().UpdateMergeRequestDiscussionNote("", mock_main.MergeId, testEditCommentData.DiscussionId, testEditCommentData.NoteId, gomock.Any()).Return(nil, nil, errorFromGitlab)
|
||||
|
||||
request := makeRequest(t, http.MethodPatch, "/mr/comment", testEditCommentData)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
|
||||
checkErrorFromGitlab(t, *data, "Could not update comment")
|
||||
})
|
||||
|
||||
t.Run("Handles non-200s from Gitlab", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPatch, "/mr/comment", EditCommentRequest{})
|
||||
server, _ := createRouterAndApi(fakeClient{updateMergeRequestDiscussionNote: updateMergeRequestDiscussionNoteNon200})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().UpdateMergeRequestDiscussionNote("", mock_main.MergeId, testEditCommentData.DiscussionId, testEditCommentData.NoteId, gomock.Any()).Return(nil, makeResponse(http.StatusSeeOther), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodPatch, "/mr/comment", testEditCommentData)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
checkNon200(t, *data, "Could not update comment", "/mr/comment")
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user