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
@@ -1,25 +1,36 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
"github.com/xanzy/go-gitlab"
|
||||
mock_main "gitlab.com/harrisoncramer/gitlab.nvim/cmd/mocks"
|
||||
"go.uber.org/mock/gomock"
|
||||
)
|
||||
|
||||
func listDraftNotes(pid interface{}, mergeRequest int, opt *gitlab.ListDraftNotesOptions, options ...gitlab.RequestOptionFunc) ([]*gitlab.DraftNote, *gitlab.Response, error) {
|
||||
return []*gitlab.DraftNote{}, makeResponse(http.StatusOK), nil
|
||||
var testPostDraftNoteRequestData = PostDraftNoteRequest{
|
||||
Comment: "Some comment",
|
||||
}
|
||||
|
||||
func listDraftNotesErr(pid interface{}, mergeRequest int, opt *gitlab.ListDraftNotesOptions, options ...gitlab.RequestOptionFunc) ([]*gitlab.DraftNote, *gitlab.Response, error) {
|
||||
return nil, makeResponse(http.StatusInternalServerError), errors.New("Some error")
|
||||
var testUpdateDraftNoteRequest = UpdateDraftNoteRequest{
|
||||
Note: "Some new note",
|
||||
}
|
||||
|
||||
var testDraftNotePublishRequest = DraftNotePublishRequest{
|
||||
Note: 3,
|
||||
PublishAll: false,
|
||||
}
|
||||
|
||||
func TestListDraftNotes(t *testing.T) {
|
||||
t.Run("Lists all draft notes", func(t *testing.T) {
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().ListDraftNotes("", mock_main.MergeId, gomock.Any()).Return([]*gitlab.DraftNote{}, makeResponse(http.StatusOK), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodGet, "/mr/draft_notes/", nil)
|
||||
server, _ := createRouterAndApi(fakeClient{listDraftNotes: listDraftNotes})
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, ListDraftNotesResponse{})
|
||||
|
||||
assert(t, data.SuccessResponse.Message, "Draft notes fetched successfully")
|
||||
@@ -27,29 +38,28 @@ func TestListDraftNotes(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("Handles error", func(t *testing.T) {
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().ListDraftNotes("", mock_main.MergeId, gomock.Any()).Return(nil, nil, errorFromGitlab)
|
||||
|
||||
request := makeRequest(t, http.MethodGet, "/mr/draft_notes/", nil)
|
||||
server, _ := createRouterAndApi(fakeClient{listDraftNotes: listDraftNotesErr})
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
|
||||
assert(t, data.Message, "Could not get draft notes")
|
||||
assert(t, data.Status, http.StatusInternalServerError)
|
||||
assert(t, data.Details, "Some error")
|
||||
assert(t, data.Details, errorFromGitlab.Error())
|
||||
})
|
||||
}
|
||||
|
||||
func createDraftNote(pid interface{}, mergeRequestIID int, opt *gitlab.CreateDraftNoteOptions, options ...gitlab.RequestOptionFunc) (*gitlab.DraftNote, *gitlab.Response, error) {
|
||||
return &gitlab.DraftNote{}, makeResponse(http.StatusOK), nil
|
||||
}
|
||||
|
||||
func createDraftNoteErr(pid interface{}, mergeRequestIID int, opt *gitlab.CreateDraftNoteOptions, options ...gitlab.RequestOptionFunc) (*gitlab.DraftNote, *gitlab.Response, error) {
|
||||
return nil, makeResponse(http.StatusInternalServerError), errors.New("Some error")
|
||||
}
|
||||
|
||||
func TestPostDraftNote(t *testing.T) {
|
||||
t.Run("Posts new draft note", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPost, "/mr/draft_notes/", PostDraftNoteRequest{})
|
||||
server, _ := createRouterAndApi(fakeClient{createDraftNote: createDraftNote})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().CreateDraftNote("", mock_main.MergeId, gomock.Any()).Return(&gitlab.DraftNote{}, makeResponse(http.StatusOK), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodPost, "/mr/draft_notes/", testPostDraftNoteRequestData)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, DraftNoteResponse{})
|
||||
|
||||
assert(t, data.SuccessResponse.Message, "Draft note created successfully")
|
||||
@@ -57,139 +67,179 @@ func TestPostDraftNote(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("Handles errors on draft note creation", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPost, "/mr/draft_notes/", PostDraftNoteRequest{})
|
||||
server, _ := createRouterAndApi(fakeClient{createDraftNote: createDraftNoteErr})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().CreateDraftNote("", mock_main.MergeId, gomock.Any()).Return(nil, nil, errorFromGitlab)
|
||||
|
||||
request := makeRequest(t, http.MethodPost, "/mr/draft_notes/", testPostDraftNoteRequestData)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
|
||||
assert(t, data.Message, "Could not create draft note")
|
||||
assert(t, data.Status, http.StatusInternalServerError)
|
||||
assert(t, data.Details, "Some error")
|
||||
assert(t, data.Details, errorFromGitlab.Error())
|
||||
})
|
||||
}
|
||||
|
||||
func deleteDraftNote(pid interface{}, mergeRequest int, note int, options ...gitlab.RequestOptionFunc) (*gitlab.Response, error) {
|
||||
return makeResponse(http.StatusOK), nil
|
||||
}
|
||||
|
||||
func deleteDraftNoteErr(pid interface{}, mergeRequest int, note int, options ...gitlab.RequestOptionFunc) (*gitlab.Response, error) {
|
||||
return makeResponse(http.StatusInternalServerError), errors.New("Something went wrong")
|
||||
}
|
||||
|
||||
func TestDeleteDraftNote(t *testing.T) {
|
||||
t.Run("Deletes draft note", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodDelete, "/mr/draft_notes/3", nil)
|
||||
server, _ := createRouterAndApi(fakeClient{deleteDraftNote: deleteDraftNote})
|
||||
data := serveRequest(t, server, request, SuccessResponse{})
|
||||
assert(t, data.Message, "Draft note deleted")
|
||||
assert(t, data.Status, http.StatusOK)
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
urlId := 10
|
||||
client.EXPECT().DeleteDraftNote("", mock_main.MergeId, urlId).Return(makeResponse(http.StatusOK), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodDelete, fmt.Sprintf("/mr/draft_notes/%d", urlId), nil)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, DraftNoteResponse{})
|
||||
|
||||
assert(t, data.SuccessResponse.Message, "Draft note deleted")
|
||||
assert(t, data.SuccessResponse.Status, http.StatusOK)
|
||||
})
|
||||
|
||||
t.Run("Handles error", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodDelete, "/mr/draft_notes/3", nil)
|
||||
server, _ := createRouterAndApi(fakeClient{deleteDraftNote: deleteDraftNoteErr})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
urlId := 10
|
||||
client.EXPECT().DeleteDraftNote("", mock_main.MergeId, urlId).Return(nil, errorFromGitlab)
|
||||
|
||||
request := makeRequest(t, http.MethodDelete, fmt.Sprintf("/mr/draft_notes/%d", urlId), nil)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
|
||||
assert(t, data.Message, "Could not delete draft note")
|
||||
assert(t, data.Status, http.StatusInternalServerError)
|
||||
assert(t, data.Details, errorFromGitlab.Error())
|
||||
})
|
||||
|
||||
t.Run("Handles bad ID", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodDelete, "/mr/draft_notes/abc", nil)
|
||||
server, _ := createRouterAndApi(fakeClient{deleteDraftNote: deleteDraftNote})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
urlId := "abc"
|
||||
|
||||
request := makeRequest(t, http.MethodDelete, fmt.Sprintf("/mr/draft_notes/%s", urlId), nil)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
|
||||
assert(t, data.Message, "Could not parse draft note ID")
|
||||
assert(t, data.Status, http.StatusBadRequest)
|
||||
})
|
||||
}
|
||||
|
||||
func updateDraftNote(pid interface{}, mergeRequest int, note int, opt *gitlab.UpdateDraftNoteOptions, options ...gitlab.RequestOptionFunc) (*gitlab.DraftNote, *gitlab.Response, error) {
|
||||
return &gitlab.DraftNote{}, makeResponse(http.StatusOK), nil
|
||||
}
|
||||
|
||||
func TestEditDraftNote(t *testing.T) {
|
||||
t.Run("Edits draft note", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPatch, "/mr/draft_notes/3", UpdateDraftNoteRequest{Note: "Some new note", Position: gitlab.PositionOptions{}})
|
||||
server, _ := createRouterAndApi(fakeClient{updateDraftNote: updateDraftNote})
|
||||
data := serveRequest(t, server, request, SuccessResponse{})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
urlId := 10
|
||||
client.EXPECT().UpdateDraftNote("", mock_main.MergeId, urlId, gomock.Any()).Return(&gitlab.DraftNote{}, makeResponse(http.StatusOK), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodPatch, fmt.Sprintf("/mr/draft_notes/%d", urlId), testUpdateDraftNoteRequest)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, DraftNoteResponse{})
|
||||
|
||||
assert(t, data.Message, "Draft note updated")
|
||||
assert(t, data.Status, http.StatusOK)
|
||||
})
|
||||
|
||||
t.Run("Handles bad ID", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPatch, "/mr/draft_notes/abc", nil)
|
||||
server, _ := createRouterAndApi(fakeClient{updateDraftNote: updateDraftNote})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
urlId := "abc"
|
||||
client.EXPECT().UpdateDraftNote("", mock_main.MergeId, urlId, gomock.Any()).Return(&gitlab.DraftNote{}, makeResponse(http.StatusOK), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodPatch, fmt.Sprintf("/mr/draft_notes/%s", urlId), testUpdateDraftNoteRequest)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
|
||||
assert(t, data.Message, "Could not parse draft note ID")
|
||||
assert(t, data.Status, http.StatusBadRequest)
|
||||
})
|
||||
|
||||
t.Run("Handles empty note", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPatch, "/mr/draft_notes/3", UpdateDraftNoteRequest{Note: ""})
|
||||
server, _ := createRouterAndApi(fakeClient{updateDraftNote: updateDraftNote})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
urlId := 10
|
||||
|
||||
testEmptyUpdateDraftNoteRequest := testUpdateDraftNoteRequest
|
||||
testEmptyUpdateDraftNoteRequest.Note = ""
|
||||
|
||||
client.EXPECT().UpdateDraftNote("", mock_main.MergeId, urlId, gomock.Any()).Return(&gitlab.DraftNote{}, makeResponse(http.StatusOK), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodPatch, fmt.Sprintf("/mr/draft_notes/%d", urlId), testEmptyUpdateDraftNoteRequest)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
|
||||
assert(t, data.Message, "Must provide draft note text")
|
||||
assert(t, data.Status, http.StatusBadRequest)
|
||||
})
|
||||
}
|
||||
|
||||
func publishDraftNote(pid interface{}, mergeRequest int, note int, options ...gitlab.RequestOptionFunc) (*gitlab.Response, error) {
|
||||
return makeResponse(http.StatusOK), nil
|
||||
}
|
||||
|
||||
func publishDraftNoteErr(pid interface{}, mergeRequest int, note int, options ...gitlab.RequestOptionFunc) (*gitlab.Response, error) {
|
||||
return nil, errors.New("Some error")
|
||||
}
|
||||
|
||||
func TestPublishDraftNote(t *testing.T) {
|
||||
t.Run("Should publish a draft note", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPost, "/mr/draft_notes/publish", DraftNotePublishRequest{Note: 3, PublishAll: false})
|
||||
server, _ := createRouterAndApi(fakeClient{
|
||||
publishDraftNote: publishDraftNote,
|
||||
})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().PublishDraftNote("", mock_main.MergeId, testDraftNotePublishRequest.Note).Return(makeResponse(http.StatusOK), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodPost, "/mr/draft_notes/publish", testDraftNotePublishRequest)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
|
||||
data := serveRequest(t, server, request, SuccessResponse{})
|
||||
assert(t, data.Message, "Draft note(s) published")
|
||||
assert(t, data.Status, http.StatusOK)
|
||||
})
|
||||
|
||||
t.Run("Handles bad/missing ID", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPost, "/mr/draft_notes/publish", DraftNotePublishRequest{PublishAll: false})
|
||||
server, _ := createRouterAndApi(fakeClient{publishDraftNote: publishDraftNote})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
|
||||
// Missing Note ID
|
||||
testDraftNotePublishRequest := DraftNotePublishRequest{
|
||||
PublishAll: false,
|
||||
}
|
||||
|
||||
request := makeRequest(t, http.MethodPost, "/mr/draft_notes/publish", testDraftNotePublishRequest)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
assert(t, data.Message, "Must provide Note ID")
|
||||
assert(t, data.Status, http.StatusBadRequest)
|
||||
})
|
||||
|
||||
t.Run("Handles error", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPost, "/mr/draft_notes/publish", DraftNotePublishRequest{PublishAll: false, Note: 3})
|
||||
server, _ := createRouterAndApi(fakeClient{publishDraftNote: publishDraftNoteErr})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().PublishDraftNote("", mock_main.MergeId, testDraftNotePublishRequest.Note).Return(nil, errorFromGitlab)
|
||||
|
||||
request := makeRequest(t, http.MethodPost, "/mr/draft_notes/publish", testDraftNotePublishRequest)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
|
||||
assert(t, data.Message, "Could not publish draft note(s)")
|
||||
assert(t, data.Status, http.StatusInternalServerError)
|
||||
})
|
||||
}
|
||||
|
||||
func publishAllDraftNotes(pid interface{}, mergeRequest int, options ...gitlab.RequestOptionFunc) (*gitlab.Response, error) {
|
||||
return makeResponse(http.StatusOK), nil
|
||||
}
|
||||
|
||||
func publishAllDraftNotesErr(pid interface{}, mergeRequest int, options ...gitlab.RequestOptionFunc) (*gitlab.Response, error) {
|
||||
return nil, errors.New("Some error")
|
||||
}
|
||||
|
||||
func TestPublishAllDraftNotes(t *testing.T) {
|
||||
t.Run("Should publish all draft notes", func(t *testing.T) {
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().PublishAllDraftNotes("", mock_main.MergeId).Return(makeResponse(http.StatusOK), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodPost, "/mr/draft_notes/publish", DraftNotePublishRequest{PublishAll: true})
|
||||
server, _ := createRouterAndApi(fakeClient{
|
||||
publishAllDraftNotes: publishAllDraftNotes,
|
||||
})
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
|
||||
data := serveRequest(t, server, request, SuccessResponse{})
|
||||
assert(t, data.Message, "Draft note(s) published")
|
||||
assert(t, data.Status, http.StatusOK)
|
||||
})
|
||||
|
||||
t.Run("Should handle an error", func(t *testing.T) {
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().PublishAllDraftNotes("", mock_main.MergeId).Return(nil, errorFromGitlab)
|
||||
|
||||
request := makeRequest(t, http.MethodPost, "/mr/draft_notes/publish", DraftNotePublishRequest{PublishAll: true})
|
||||
server, _ := createRouterAndApi(fakeClient{
|
||||
publishAllDraftNotes: publishAllDraftNotesErr,
|
||||
})
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
assert(t, data.Message, "Could not publish draft note(s)")
|
||||
assert(t, data.Status, http.StatusInternalServerError)
|
||||
|
||||
Reference in New Issue
Block a user