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:
committed by
GitHub
parent
aa5d3c1f52
commit
4ae623cd65
@@ -1,51 +1,80 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
"github.com/xanzy/go-gitlab"
|
||||
mock_main "gitlab.com/harrisoncramer/gitlab.nvim/cmd/mocks"
|
||||
"go.uber.org/mock/gomock"
|
||||
)
|
||||
|
||||
func addMergeRequestDiscussionNote(pid interface{}, mergeRequest int, discussion string, opt *gitlab.AddMergeRequestDiscussionNoteOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Note, *gitlab.Response, error) {
|
||||
return &gitlab.Note{}, makeResponse(http.StatusOK), nil
|
||||
}
|
||||
|
||||
func addMergeRequestDiscussionNoteErr(pid interface{}, mergeRequest int, discussion string, opt *gitlab.AddMergeRequestDiscussionNoteOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Note, *gitlab.Response, error) {
|
||||
return nil, nil, errors.New("Some error from Gitlab")
|
||||
}
|
||||
|
||||
func addMergeRequestDiscussionNoteNon200(pid interface{}, mergeRequest int, discussion string, opt *gitlab.AddMergeRequestDiscussionNoteOptions, options ...gitlab.RequestOptionFunc) (*gitlab.Note, *gitlab.Response, error) {
|
||||
return nil, makeResponse(http.StatusSeeOther), nil
|
||||
var testReplyRequest = ReplyRequest{
|
||||
DiscussionId: "abc123",
|
||||
Reply: "Some Reply",
|
||||
IsDraft: false,
|
||||
}
|
||||
|
||||
func TestReplyHandler(t *testing.T) {
|
||||
t.Run("Sends a reply", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPost, "/mr/reply", ReplyRequest{})
|
||||
server, _ := createRouterAndApi(fakeClient{addMergeRequestDiscussionNote: addMergeRequestDiscussionNote})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().AddMergeRequestDiscussionNote(
|
||||
"",
|
||||
mock_main.MergeId,
|
||||
testReplyRequest.DiscussionId,
|
||||
gomock.Any(),
|
||||
).Return(&gitlab.Note{}, makeResponse(http.StatusOK), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodPost, "/mr/reply", testReplyRequest)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
|
||||
data := serveRequest(t, server, request, ReplyResponse{})
|
||||
assert(t, data.SuccessResponse.Message, "Replied to comment")
|
||||
assert(t, data.SuccessResponse.Status, http.StatusOK)
|
||||
})
|
||||
|
||||
t.Run("Disallows non-POST methods", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodGet, "/mr/reply", ReplyRequest{})
|
||||
server, _ := createRouterAndApi(fakeClient{addMergeRequestDiscussionNote: addMergeRequestDiscussionNote})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
|
||||
request := makeRequest(t, http.MethodPut, "/mr/reply", testReplyRequest)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
checkBadMethod(t, *data, http.MethodPost)
|
||||
})
|
||||
|
||||
t.Run("Handles errors from Gitlab client", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPost, "/mr/reply", ReplyRequest{})
|
||||
server, _ := createRouterAndApi(fakeClient{addMergeRequestDiscussionNote: addMergeRequestDiscussionNoteErr})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().AddMergeRequestDiscussionNote(
|
||||
"",
|
||||
mock_main.MergeId,
|
||||
testReplyRequest.DiscussionId,
|
||||
gomock.Any(),
|
||||
).Return(nil, nil, errorFromGitlab)
|
||||
|
||||
request := makeRequest(t, http.MethodPost, "/mr/reply", testReplyRequest)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
checkErrorFromGitlab(t, *data, "Could not leave reply")
|
||||
})
|
||||
|
||||
t.Run("Handles non-200s from Gitlab client", func(t *testing.T) {
|
||||
request := makeRequest(t, http.MethodPost, "/mr/reply", ReplyRequest{})
|
||||
server, _ := createRouterAndApi(fakeClient{addMergeRequestDiscussionNote: addMergeRequestDiscussionNoteNon200})
|
||||
client := mock_main.NewMockClient(t)
|
||||
mock_main.WithMr(t, client)
|
||||
client.EXPECT().AddMergeRequestDiscussionNote(
|
||||
"",
|
||||
mock_main.MergeId,
|
||||
testReplyRequest.DiscussionId,
|
||||
gomock.Any(),
|
||||
).Return(nil, makeResponse(http.StatusSeeOther), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodPost, "/mr/reply", testReplyRequest)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
checkNon200(t, *data, "Could not leave reply", "/mr/reply")
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user