Add testcases for group and project iterations

Added missing registration of services.

Author: Daniel Steinke

gitlab.go

@@ -131,6 +131,7 @@ type Client struct {
 	GroupCluster          *GroupClustersService
 	GroupImportExport     *GroupImportExportService
 	GroupIssueBoards      *GroupIssueBoardsService
+	GroupIterations       *GroupIterationsService
 	GroupLabels           *GroupLabelsService
 	GroupMembers          *GroupMembersService
 	GroupMilestones       *GroupMilestonesService
@@ -167,6 +168,7 @@ type Client struct {
 	ProjectAccessTokens   *ProjectAccessTokensService
 	ProjectCluster        *ProjectClustersService
 	ProjectImportExport   *ProjectImportExportService
+	ProjectIterations     *ProjectIterationsService
 	ProjectMembers        *ProjectMembersService
 	ProjectMirrors        *ProjectMirrorService
 	ProjectSnippets       *ProjectSnippetsService
@@ -325,6 +327,7 @@ func newClient(options ...ClientOptionFunc) (*Client, error) {
 	c.GroupCluster = &GroupClustersService{client: c}
 	c.GroupImportExport = &GroupImportExportService{client: c}
 	c.GroupIssueBoards = &GroupIssueBoardsService{client: c}
+	c.GroupIterations = &GroupIterationsService{client: c}
 	c.GroupLabels = &GroupLabelsService{client: c}
 	c.GroupMembers = &GroupMembersService{client: c}
 	c.GroupMilestones = &GroupMilestonesService{client: c}
@@ -361,6 +364,7 @@ func newClient(options ...ClientOptionFunc) (*Client, error) {
 	c.ProjectAccessTokens = &ProjectAccessTokensService{client: c}
 	c.ProjectCluster = &ProjectClustersService{client: c}
 	c.ProjectImportExport = &ProjectImportExportService{client: c}
+	c.ProjectIterations = &ProjectIterationsService{client: c}
 	c.ProjectMembers = &ProjectMembersService{client: c}
 	c.ProjectMirrors = &ProjectMirrorService{client: c}
 	c.ProjectSnippets = &ProjectSnippetsService{client: c}

group_iterations.go

@@ -38,6 +38,7 @@ type GroupIterationsService struct {
 type GroupIteration struct {
 	ID          int        `json:"id"`
 	IID         int        `json:"iid"`
+	Sequence    int        `json:"sequence"`
 	GroupID     int        `json:"group_id"`
 	Title       string     `json:"title"`
 	Description string     `json:"description"`

group_iterations_test.go

@@ -0,0 +1,48 @@
+package gitlab
+
+import (
+	"fmt"
+	"net/http"
+	"reflect"
+	"testing"
+)
+
+func TestListGroupIterations(t *testing.T) {
+	mux, server, client := setup(t)
+	defer teardown(server)
+
+	mux.HandleFunc("/api/v4/groups/5/iterations",
+		func(w http.ResponseWriter, r *http.Request) {
+			testMethod(t, r, http.MethodGet)
+			fmt.Fprintf(w, `[{
+								"id": 53,
+								"iid": 13,
+								"sequence": 1,
+								"group_id": 5,
+								"title": "Iteration II",
+								"description": "Ipsum Lorem ipsum",
+								"state": 2,
+								"web_url": "http://gitlab.example.com/groups/my-group/-/iterations/13"
+								}
+							]`)
+		})
+
+	iterations, _, err := client.GroupIterations.ListGroupIterations(5, &ListGroupIterationsOptions{})
+	if err != nil {
+		t.Errorf("GroupIterations.ListGroupIterations returned error: %v", err)
+	}
+
+	want := []*GroupIteration{{
+		ID:          53,
+		IID:         13,
+		Sequence:    1,
+		GroupID:     5,
+		Title:       "Iteration II",
+		Description: "Ipsum Lorem ipsum",
+		State:       2,
+		WebURL:      "http://gitlab.example.com/groups/my-group/-/iterations/13",
+	}}
+	if !reflect.DeepEqual(want, iterations) {
+		t.Errorf("GroupIterations.ListGroupIterations returned %+v, want %+v", iterations, want)
+	}
+}

iterations.go renamed to project_iterations.go

@@ -27,13 +27,18 @@ import (
 //
 // GitLab API docs: https://docs.gitlab.com/ee/api/iterations.html
 
-type IterationsService struct {
+type ProjectIterationsService struct {
 	client *Client
 }
 
+// Iteration represents a GitLab iteration
+//
+// GitLab API docs: https://docs.gitlab.com/ee/api/iterations.html
+// CAVEAT: GitLab docu currently misses `sequence` key.
 type Iteration struct {
 	ID          int        `json:"id"`
 	IID         int        `json:"iid"`
+	Sequence    int        `json:"sequence"`
 	GroupID     int        `json:"group_id"`
 	Title       string     `json:"title"`
 	Description string     `json:"description"`
@@ -61,10 +66,10 @@ type ListProjectIterationsOptions struct {
 }
 
 //ListProjectIterations lists all iterations of the projects ancestor groups.
-//As of GitLab 13.5, there are not direct project-level iterations.
+//As of GitLab 13.5, there are no direct project-level iterations.
 
 // GitLab API docs: https://docs.gitlab.com/ee/api/iterations.html
-func (i *IterationsService) ListProjectIterations(pid interface{}, opt *ListGroupProjectsOptions, options ...RequestOptionFunc) ([]*Iteration, *Response, error) {
+func (i *ProjectIterationsService) ListProjectIterations(pid interface{}, opt *ListProjectIterationsOptions, options ...RequestOptionFunc) ([]*Iteration, *Response, error) {
 	project, err := parseID(pid)
 	if err != nil {
 		return nil, nil, err

project_iterations_test.go

@@ -0,0 +1,48 @@
+package gitlab
+
+import (
+	"fmt"
+	"net/http"
+	"reflect"
+	"testing"
+)
+
+func TestListProjectIterations(t *testing.T) {
+	mux, server, client := setup(t)
+	defer teardown(server)
+
+	mux.HandleFunc("/api/v4/projects/42/iterations",
+		func(w http.ResponseWriter, r *http.Request) {
+			testMethod(t, r, http.MethodGet)
+			fmt.Fprintf(w, `[{
+								"id": 53,
+								"iid": 13,
+								"sequence": 1,
+								"group_id": 5,
+								"title": "Iteration II",
+								"description": "Ipsum Lorem ipsum",
+								"state": 2,
+								"web_url": "http://gitlab.example.com/groups/my-group/-/iterations/13"
+								}
+							]`)
+		})
+
+	iterations, _, err := client.ProjectIterations.ListProjectIterations(42, &ListProjectIterationsOptions{})
+	if err != nil {
+		t.Errorf("GroupIterations.ListGroupIterations returned error: %v", err)
+	}
+
+	want := []*Iteration{{
+		ID:          53,
+		IID:         13,
+		Sequence:    1,
+		GroupID:     5,
+		Title:       "Iteration II",
+		Description: "Ipsum Lorem ipsum",
+		State:       2,
+		WebURL:      "http://gitlab.example.com/groups/my-group/-/iterations/13",
+	}}
+	if !reflect.DeepEqual(want, iterations) {
+		t.Errorf("ProjectIterations.ListProjectIterations returned %+v, want %+v", iterations, want)
+	}
+}

testdata/list_group_iterations.json

@@ -0,0 +1,16 @@
+[
+    {
+      "id": 53,
+      "iid": 13,
+      "sequence": 1,
+      "group_id": 5,
+      "title": "Iteration II",
+      "description": "Ipsum Lorem ipsum",
+      "state": 2,
+      "created_at": "2020-01-27T05:07:12.573Z",
+      "updated_at": "2020-01-27T05:07:12.573Z",
+      "due_date": "2020-02-01",
+      "start_date": "2020-02-14",
+      "web_url": "http://gitlab.example.com/groups/my-group/-/iterations/13"
+    }
+]