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,105 +1,97 @@
|
||||
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 createMrFn(pid interface{}, opt *gitlab.CreateMergeRequestOptions, options ...gitlab.RequestOptionFunc) (*gitlab.MergeRequest, *gitlab.Response, error) {
|
||||
return &gitlab.MergeRequest{}, makeResponse(http.StatusOK), nil
|
||||
}
|
||||
|
||||
func createMrFnErr(pid interface{}, opt *gitlab.CreateMergeRequestOptions, options ...gitlab.RequestOptionFunc) (*gitlab.MergeRequest, *gitlab.Response, error) {
|
||||
return nil, nil, errors.New("Some error from Gitlab")
|
||||
}
|
||||
|
||||
func createMrFnNon200(pid interface{}, opt *gitlab.CreateMergeRequestOptions, options ...gitlab.RequestOptionFunc) (*gitlab.MergeRequest, *gitlab.Response, error) {
|
||||
return nil, makeResponse(http.StatusSeeOther), nil
|
||||
var testCreateMrRequestData = CreateMrRequest{
|
||||
Title: "Some title",
|
||||
Description: "Some description",
|
||||
TargetBranch: "main",
|
||||
DeleteBranch: false,
|
||||
Squash: false,
|
||||
}
|
||||
|
||||
func TestCreateMr(t *testing.T) {
|
||||
t.Run("Creates an MR", func(t *testing.T) {
|
||||
client := mock_main.NewMockClient(t)
|
||||
client.EXPECT().CreateMergeRequest("", gomock.Any()).Return(&gitlab.MergeRequest{}, makeResponse(http.StatusOK), nil)
|
||||
|
||||
body := CreateMrRequest{
|
||||
Title: "Some title",
|
||||
Description: "Some description",
|
||||
TargetBranch: "main",
|
||||
DeleteBranch: false,
|
||||
Squash: false,
|
||||
}
|
||||
request := makeRequest(t, http.MethodPost, "/create_mr", testCreateMrRequestData)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
|
||||
request := makeRequest(t, http.MethodPost, "/create_mr", body)
|
||||
server, _ := createRouterAndApi(fakeClient{createMrFn: createMrFn})
|
||||
data := serveRequest(t, server, request, SuccessResponse{})
|
||||
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", CreateMrRequest{})
|
||||
server, _ := createRouterAndApi(fakeClient{createMrFn: createMrFn})
|
||||
client := mock_main.NewMockClient(t)
|
||||
client.EXPECT().CreateMergeRequest("", gomock.Any()).Return(nil, makeResponse(http.StatusSeeOther), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodPatch, "/create_mr", testCreateMrRequestData)
|
||||
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) {
|
||||
body := CreateMrRequest{
|
||||
Title: "Some title",
|
||||
Description: "Some description",
|
||||
TargetBranch: "main",
|
||||
DeleteBranch: false,
|
||||
Squash: false,
|
||||
}
|
||||
request := makeRequest(t, http.MethodPost, "/create_mr", body)
|
||||
server, _ := createRouterAndApi(fakeClient{createMrFn: createMrFnErr})
|
||||
client := mock_main.NewMockClient(t)
|
||||
client.EXPECT().CreateMergeRequest("", gomock.Any()).Return(nil, nil, errorFromGitlab)
|
||||
|
||||
request := makeRequest(t, http.MethodPost, "/create_mr", testCreateMrRequestData)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
|
||||
checkErrorFromGitlab(t, *data, "Could not create MR")
|
||||
})
|
||||
|
||||
t.Run("Handles non-200s from Gitlab client", func(t *testing.T) {
|
||||
body := CreateMrRequest{
|
||||
Title: "Some title",
|
||||
Description: "Some description",
|
||||
TargetBranch: "main",
|
||||
DeleteBranch: false,
|
||||
Squash: false,
|
||||
}
|
||||
request := makeRequest(t, http.MethodPost, "/create_mr", body)
|
||||
server, _ := createRouterAndApi(fakeClient{createMrFn: createMrFnNon200})
|
||||
client := mock_main.NewMockClient(t)
|
||||
client.EXPECT().CreateMergeRequest("", gomock.Any()).Return(nil, makeResponse(http.StatusSeeOther), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodPost, "/create_mr", testCreateMrRequestData)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
|
||||
checkNon200(t, *data, "Could not create MR", "/create_mr")
|
||||
})
|
||||
|
||||
t.Run("Handles missing titles", func(t *testing.T) {
|
||||
body := CreateMrRequest{
|
||||
Title: "",
|
||||
Description: "Some description",
|
||||
TargetBranch: "main",
|
||||
DeleteBranch: false,
|
||||
Squash: false,
|
||||
}
|
||||
request := makeRequest(t, http.MethodPost, "/create_mr", body)
|
||||
server, _ := createRouterAndApi(fakeClient{createMrFn: createMrFn})
|
||||
client := mock_main.NewMockClient(t)
|
||||
|
||||
missingTitleRequest := testCreateMrRequestData
|
||||
missingTitleRequest.Title = ""
|
||||
|
||||
client.EXPECT().CreateMergeRequest("", gomock.Any()).Return(&gitlab.MergeRequest{}, makeResponse(http.StatusOK), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodPost, "/create_mr", missingTitleRequest)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
|
||||
assert(t, data.Status, http.StatusBadRequest)
|
||||
assert(t, data.Message, "Could not create MR")
|
||||
assert(t, data.Details, "Title cannot be empty")
|
||||
})
|
||||
|
||||
t.Run("Handles missing target branch", func(t *testing.T) {
|
||||
body := CreateMrRequest{
|
||||
Title: "Some title",
|
||||
Description: "Some description",
|
||||
TargetBranch: "",
|
||||
DeleteBranch: false,
|
||||
Squash: false,
|
||||
}
|
||||
request := makeRequest(t, http.MethodPost, "/create_mr", body)
|
||||
server, _ := createRouterAndApi(fakeClient{createMrFn: createMrFn})
|
||||
client := mock_main.NewMockClient(t)
|
||||
|
||||
missingTitleRequest := testCreateMrRequestData
|
||||
missingTitleRequest.TargetBranch = ""
|
||||
|
||||
client.EXPECT().CreateMergeRequest("", gomock.Any()).Return(&gitlab.MergeRequest{}, makeResponse(http.StatusOK), nil)
|
||||
|
||||
request := makeRequest(t, http.MethodPost, "/create_mr", missingTitleRequest)
|
||||
server, _ := CreateRouterAndApi(client)
|
||||
data := serveRequest(t, server, request, ErrorResponse{})
|
||||
|
||||
assert(t, data.Status, http.StatusBadRequest)
|
||||
assert(t, data.Message, "Could not create MR")
|
||||
assert(t, data.Details, "Target branch cannot be empty")
|
||||
|
||||
Reference in New Issue
Block a user