1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
|
// Copyright 2014 The go-github AUTHORS. All rights reserved.
//
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package github
import (
"context"
"encoding/json"
"fmt"
"net/http"
"testing"
"github.com/google/go-cmp/cmp"
)
func TestRepositoriesService_Merge(t *testing.T) {
client, mux, _, teardown := setup()
defer teardown()
input := &RepositoryMergeRequest{
Base: String("b"),
Head: String("h"),
CommitMessage: String("c"),
}
mux.HandleFunc("/repos/o/r/merges", func(w http.ResponseWriter, r *http.Request) {
v := new(RepositoryMergeRequest)
assertNilError(t, json.NewDecoder(r.Body).Decode(v))
testMethod(t, r, "POST")
if !cmp.Equal(v, input) {
t.Errorf("Request body = %+v, want %+v", v, input)
}
fmt.Fprint(w, `{"sha":"s"}`)
})
ctx := context.Background()
commit, _, err := client.Repositories.Merge(ctx, "o", "r", input)
if err != nil {
t.Errorf("Repositories.Merge returned error: %v", err)
}
want := &RepositoryCommit{SHA: String("s")}
if !cmp.Equal(commit, want) {
t.Errorf("Repositories.Merge returned %+v, want %+v", commit, want)
}
const methodName = "Merge"
testBadOptions(t, methodName, func() (err error) {
_, _, err = client.Repositories.Merge(ctx, "\n", "\n", input)
return err
})
testNewRequestAndDoFailure(t, methodName, client, func() (*Response, error) {
got, resp, err := client.Repositories.Merge(ctx, "o", "r", input)
if got != nil {
t.Errorf("testNewRequestAndDoFailure %v = %#v, want nil", methodName, got)
}
return resp, err
})
}
func TestRepositoryMergeRequest_Marshal(t *testing.T) {
testJSONMarshal(t, &RepositoryMergeRequest{}, "{}")
u := &RepositoryMergeRequest{
Base: String("base"),
Head: String("head"),
CommitMessage: String("cm"),
}
want := `{
"base": "base",
"head": "head",
"commit_message": "cm"
}`
testJSONMarshal(t, u, want)
}
func TestRepositoriesService_MergeUpstream(t *testing.T) {
client, mux, _, teardown := setup()
defer teardown()
input := &RepoMergeUpstreamRequest{
Branch: String("b"),
}
mux.HandleFunc("/repos/o/r/merge-upstream", func(w http.ResponseWriter, r *http.Request) {
v := new(RepoMergeUpstreamRequest)
assertNilError(t, json.NewDecoder(r.Body).Decode(v))
testMethod(t, r, "POST")
if !cmp.Equal(v, input) {
t.Errorf("Request body = %+v, want %+v", v, input)
}
fmt.Fprint(w, `{"merge_type":"m"}`)
})
ctx := context.Background()
result, _, err := client.Repositories.MergeUpstream(ctx, "o", "r", input)
if err != nil {
t.Errorf("Repositories.MergeUpstream returned error: %v", err)
}
want := &RepoMergeUpstreamResult{MergeType: String("m")}
if !cmp.Equal(result, want) {
t.Errorf("Repositories.MergeUpstream returned %+v, want %+v", result, want)
}
const methodName = "MergeUpstream"
testBadOptions(t, methodName, func() (err error) {
_, _, err = client.Repositories.MergeUpstream(ctx, "\n", "\n", input)
return err
})
testNewRequestAndDoFailure(t, methodName, client, func() (*Response, error) {
got, resp, err := client.Repositories.MergeUpstream(ctx, "o", "r", input)
if got != nil {
t.Errorf("testNewRequestAndDoFailure %v = %#v, want nil", methodName, got)
}
return resp, err
})
}
func TestRepoMergeUpstreamResult_Marshal(t *testing.T) {
testJSONMarshal(t, &RepoMergeUpstreamResult{}, "{}")
u := &RepoMergeUpstreamResult{
Message: String("message"),
MergeType: String("merge_type"),
BaseBranch: String("base_branch"),
}
want := `{
"message": "message",
"merge_type": "merge_type",
"base_branch": "base_branch"
}`
testJSONMarshal(t, u, want)
}
|
