Skip to content

Commit 1deb666

Browse files
committed
creating a new client won't ever return an error
1 parent f3ace17 commit 1deb666

File tree

2 files changed

+13
-19
lines changed

2 files changed

+13
-19
lines changed

client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ type Client struct {
1919
}
2020

2121
// NewClient makes a new Client capable of making GraphQL requests.
22-
func NewClient(endpoint string, opts ...ClientOption) (*Client, error) {
22+
func NewClient(endpoint string, opts ...ClientOption) *Client {
2323
c := &Client{
2424
endpoint: endpoint,
2525
}
@@ -29,7 +29,7 @@ func NewClient(endpoint string, opts ...ClientOption) (*Client, error) {
2929
if c.httpClient == nil {
3030
c.httpClient = http.DefaultClient
3131
}
32-
return c, nil
32+
return c
3333
}
3434

3535
// Run executes the query and unmarshals the response from the data field

client_test.go

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ func TestWithClient(t *testing.T) {
2727
}
2828

2929
ctx := context.Background()
30-
client, err := NewClient("", WithHTTPClient(testClient))
31-
is.NoErr(err)
30+
client := NewClient("", WithHTTPClient(testClient))
3231

3332
req := NewRequest(``)
3433
client.Run(ctx, req, nil)
@@ -53,13 +52,12 @@ func TestDo(t *testing.T) {
5352
defer srv.Close()
5453

5554
ctx := context.Background()
56-
client, err := NewClient(srv.URL)
57-
is.NoErr(err)
55+
client := NewClient(srv.URL)
5856

5957
ctx, cancel := context.WithTimeout(ctx, 1*time.Second)
6058
defer cancel()
6159
var responseData map[string]interface{}
62-
err = client.Run(ctx, &Request{q: "query {}"}, &responseData)
60+
err := client.Run(ctx, &Request{q: "query {}"}, &responseData)
6361
is.NoErr(err)
6462
is.Equal(calls, 1) // calls
6563
is.Equal(responseData["something"], "yes")
@@ -82,13 +80,12 @@ func TestDoErr(t *testing.T) {
8280
defer srv.Close()
8381

8482
ctx := context.Background()
85-
client, err := NewClient(srv.URL)
86-
is.NoErr(err)
83+
client := NewClient(srv.URL)
8784

8885
ctx, cancel := context.WithTimeout(ctx, 1*time.Second)
8986
defer cancel()
9087
var responseData map[string]interface{}
91-
err = client.Run(ctx, &Request{q: "query {}"}, &responseData)
88+
err := client.Run(ctx, &Request{q: "query {}"}, &responseData)
9289
is.True(err != nil)
9390
is.Equal(err.Error(), "graphql: Something went wrong")
9491
}
@@ -110,12 +107,11 @@ func TestDoNoResponse(t *testing.T) {
110107
defer srv.Close()
111108

112109
ctx := context.Background()
113-
client, err := NewClient(srv.URL)
114-
is.NoErr(err)
110+
client := NewClient(srv.URL)
115111

116112
ctx, cancel := context.WithTimeout(ctx, 1*time.Second)
117113
defer cancel()
118-
err = client.Run(ctx, &Request{q: "query {}"}, nil)
114+
err := client.Run(ctx, &Request{q: "query {}"}, nil)
119115
is.NoErr(err)
120116
is.Equal(calls, 1) // calls
121117
}
@@ -136,8 +132,7 @@ func TestQuery(t *testing.T) {
136132
ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
137133
defer cancel()
138134

139-
client, err := NewClient(srv.URL)
140-
is.NoErr(err)
135+
client := NewClient(srv.URL)
141136

142137
req := NewRequest("query {}")
143138
req.Var("username", "matryer")
@@ -149,7 +144,7 @@ func TestQuery(t *testing.T) {
149144
var resp struct {
150145
Value string
151146
}
152-
err = client.Run(ctx, req, &resp)
147+
err := client.Run(ctx, req, &resp)
153148
is.NoErr(err)
154149
is.Equal(calls, 1)
155150

@@ -180,15 +175,14 @@ func TestFile(t *testing.T) {
180175
ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
181176
defer cancel()
182177

183-
client, err := NewClient(srv.URL)
184-
is.NoErr(err)
178+
client := NewClient(srv.URL)
185179

186180
f := strings.NewReader(`This is a file`)
187181

188182
req := NewRequest("query {}")
189183
req.File("filename.txt", f)
190184

191-
err = client.Run(ctx, req, nil)
185+
err := client.Run(ctx, req, nil)
192186
is.NoErr(err)
193187
}
194188

0 commit comments

Comments
 (0)