Commit f5f912dd authored by Heidi Berry's avatar Heidi Berry Committed by Patrick Rice
Browse files

fix(merge_requests): Reinstate missing request option 

Changelog: Improvements
parent 44a866ec

merge_requests.go

+1 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ type ListGroupMergeRequestsOptions struct { 
	SourceBranch           *string           `url:"source_branch,omitempty" json:"source_branch,omitempty"`

	TargetBranch           *string           `url:"target_branch,omitempty" json:"target_branch,omitempty"`

	Search                 *string           `url:"search,omitempty" json:"search,omitempty"`

	In                     *string           `url:"in,omitempty" json:"in,omitempty"`

	Draft                  *bool             `url:"draft,omitempty" json:"draft,omitempty"`

	WIP                    *string           `url:"wip,omitempty" json:"wip,omitempty"`

}

merge_requests_test.go

+33 −0
Original line number Diff line number Diff line
@@ -764,3 +764,36 @@ func TestListGroupMergeRequests(t *testing.T) { 
		},

	}, mr.LabelDetails)

}



func TestListGroupMergeRequests_search(t *testing.T) {

	t.Parallel()

	mux, client := setup(t)

	const groupID = "12345"



	path := fmt.Sprintf("/%sgroups/%s/merge_requests", apiVersionPath, groupID)

	mux.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {

		testMethod(t, r, http.MethodGet)

		testFormBody(t, r, "search", "Renovate")

		testFormBody(t, r, "in", "title,description")

		testFormBody(t, r, "state", "merged")

		testFormBody(t, r, "with_labels_details", "true")



		mustWriteHTTPResponse(t, w, "testdata/list_group_merge_requests.json")

	})



	opts := ListGroupMergeRequestsOptions{

		Search:            Ptr("Renovate"),

		In:                Ptr("title,description"),

		State:             Ptr("merged"),

		WithLabelsDetails: Ptr(true),

	}



	mrs, resp, err := client.MergeRequests.ListGroupMergeRequests(groupID, &opts)

	require.NoError(t, err)

	require.NotNil(t, resp)

	require.Len(t, mrs, 1)



	mr := mrs[0]



	assert.Contains(t, mr.Description, "Renovate")

}