Skip to content

add assertions, add source and project ID to JSON, tests, and struct #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 2, 2016
Merged

add assertions, add source and project ID to JSON, tests, and struct #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions merge_requests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,24 @@ const (
)

type MergeRequest struct {
Id int `json:"id,omitempty"`
Iid int `json:"iid,omitempty"`
TargetBranch string `json:"target_branch,omitempty"`
SourceBranch string `json:"source_branch,omitempty"`
ProjectId int `json:"project_id,omitempty"`
Title string `json:"title,omitempty"`
State string `json:"state,omitempty"`
CreatedAt string `json:"created_at,omitempty"`
UpdatedAt string `json:"updated_at,omitempty"`
Upvotes int `json:"upvotes,omitempty"`
Downvotes int `json:"downvotes,omitempty"`
Author *User `json:"author,omitempty"`
Assignee *User `json:"assignee,omitempty"`
Description string `json:"description,omitempty"`
WorkInProgress bool `json:"work_in_progress,omitempty"`
MergeStatus string `json:"merge_status,omitempty"`
Id int `json:"id,omitempty"`
Iid int `json:"iid,omitempty"`
TargetBranch string `json:"target_branch,omitempty"`
SourceBranch string `json:"source_branch,omitempty"`
ProjectId int `json:"project_id,omitempty"`
Title string `json:"title,omitempty"`
State string `json:"state,omitempty"`
CreatedAt string `json:"created_at,omitempty"`
UpdatedAt string `json:"updated_at,omitempty"`
Upvotes int `json:"upvotes,omitempty"`
Downvotes int `json:"downvotes,omitempty"`
Author *User `json:"author,omitempty"`
Assignee *User `json:"assignee,omitempty"`
Description string `json:"description,omitempty"`
WorkInProgress bool `json:"work_in_progress,omitempty"`
MergeStatus string `json:"merge_status,omitempty"`
SourceProjectID string `json:"source_project_id,omitempty"`
TargetProjectID string `json:"target_project_id,omitempty"`
}

type ChangeItem struct {
Expand Down
6 changes: 5 additions & 1 deletion merge_requests_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package gogitlab

import (
"github.com/stretchr/testify/assert"
"testing"

"github.com/stretchr/testify/assert"
)

func TestProjectMergeRequests(t *testing.T) {
Expand All @@ -20,6 +21,9 @@ func TestProjectMergeRequest(t *testing.T) {

assert.Equal(t, err, nil)
assert.Equal(t, mr.TargetBranch, "master")
assert.Equal(t, mr.MergeStatus, "can_be_merged")
assert.Equal(t, mr.SourceProjectID, "2")
assert.Equal(t, mr.TargetProjectID, "3")
defer ts.Close()
}

Expand Down
7 changes: 5 additions & 2 deletions stubs/merge_requests/show.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
},
"source_project_id": "2",
"target_project_id": "3",
"description":"fixed login page css paddings",
"work_in_progress": false
}
"work_in_progress": false,
"merge_status": "can_be_merged"
}