Skip to content

Commit 713e92b

Browse files
alexzimmer96alexzimmer96
committed
Merge remote-tracking branch 'upstream/master'
2 parents 20ff960 + 466cc16 commit 713e92b

4 files changed

Lines changed: 27 additions & 33 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ language: go
33
sudo: false
44

55
go:
6-
- 1.7.x
7-
- 1.8.x
8-
- 1.9.x
96
- 1.10.x
107
- 1.11.x
8+
- 1.12.x
119

1210
before_install:
1311
- go get golang.org/x/tools/cmd/cover

‎error_test.go‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
package respond_test
1+
package respond
22

33
import (
44
"net/http"
55
"net/http/httptest"
66
"testing"
7-
8-
resp "github.com/nicklaw5/go-respond"
97
)
108

119
type Error struct {
@@ -20,7 +18,7 @@ func TestBadRequest(t *testing.T) {
2018

2119
rr := httptest.NewRecorder()
2220
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
23-
resp.NewResponse(w).
21+
NewResponse(w).
2422
BadRequest(&Error{400, "An error occurred"})
2523
})
2624
handler.ServeHTTP(rr, req)
@@ -42,7 +40,7 @@ func TestUnauthorized(t *testing.T) {
4240

4341
rr := httptest.NewRecorder()
4442
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
45-
resp.NewResponse(w).
43+
NewResponse(w).
4644
Unauthorized(&Error{401, "Unauthorized"})
4745
})
4846
handler.ServeHTTP(rr, req)
@@ -64,7 +62,7 @@ func TestForbidden(t *testing.T) {
6462

6563
rr := httptest.NewRecorder()
6664
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
67-
resp.NewResponse(w).
65+
NewResponse(w).
6866
Forbidden(&Error{403, "Forbidden"})
6967
})
7068
handler.ServeHTTP(rr, req)
@@ -86,7 +84,7 @@ func TestNotFound(t *testing.T) {
8684

8785
rr := httptest.NewRecorder()
8886
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
89-
resp.NewResponse(w).
87+
NewResponse(w).
9088
NotFound(&Error{404, "Not found"})
9189
})
9290
handler.ServeHTTP(rr, req)
@@ -108,7 +106,7 @@ func TestMethodNotAllowed(t *testing.T) {
108106

109107
rr := httptest.NewRecorder()
110108
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
111-
resp.NewResponse(w).
109+
NewResponse(w).
112110
MethodNotAllowed(&Error{405, "Method not allowed"})
113111
})
114112
handler.ServeHTTP(rr, req)
@@ -130,7 +128,7 @@ func TestConflict(t *testing.T) {
130128

131129
rr := httptest.NewRecorder()
132130
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
133-
res := resp.NewResponse(w)
131+
res := NewResponse(w)
134132
res.Conflict(&Error{409, "Username already take"})
135133
})
136134
handler.ServeHTTP(rr, req)
@@ -152,7 +150,7 @@ func TestLengthRequired(t *testing.T) {
152150

153151
rr := httptest.NewRecorder()
154152
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
155-
res := resp.NewResponse(w)
153+
res := NewResponse(w)
156154
res.LengthRequired(&Error{411, "Content-Type header not long enough"})
157155
})
158156
handler.ServeHTTP(rr, req)
@@ -174,7 +172,7 @@ func TestPreconditionFailed(t *testing.T) {
174172

175173
rr := httptest.NewRecorder()
176174
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
177-
res := resp.NewResponse(w)
175+
res := NewResponse(w)
178176
res.PreconditionFailed(&Error{412, "X-Auth-Key header is not present"})
179177
})
180178
handler.ServeHTTP(rr, req)
@@ -196,7 +194,7 @@ func TestUnprocessableEntity(t *testing.T) {
196194

197195
rr := httptest.NewRecorder()
198196
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
199-
resp.NewResponse(w).
197+
NewResponse(w).
200198
UnprocessableEntity(&Error{422, "Unprocessable entity"})
201199
})
202200
handler.ServeHTTP(rr, req)
@@ -218,7 +216,7 @@ func TestInternalServerError(t *testing.T) {
218216

219217
rr := httptest.NewRecorder()
220218
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
221-
resp.NewResponse(w).
219+
NewResponse(w).
222220
InternalServerError(&Error{500, "An unexpected error occurred"})
223221
})
224222
handler.ServeHTTP(rr, req)
@@ -240,7 +238,7 @@ func TestNotImplemented(t *testing.T) {
240238

241239
rr := httptest.NewRecorder()
242240
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
243-
resp.NewResponse(w).
241+
NewResponse(w).
244242
NotImplemented(&Error{501, "Unsupported request"})
245243
})
246244
handler.ServeHTTP(rr, req)
@@ -262,23 +260,23 @@ var testData = []struct {
262260
inputHttpCode int
263261
inputJsonData string
264262

265-
methodUnderTest func(r *resp.Response, v interface{})
263+
methodUnderTest func(r *Response, v interface{})
266264

267265
expectedStatus int
268266
expectedBody string
269267
}{
270268
{"502 Bad Gateway",
271269
/*input*/ "POST", 502, "Bad Gateway - sample error content",
272-
/*method under test*/ (*resp.Response).BadGateway,
270+
/*method under test*/ (*Response).BadGateway,
273271
/*expected*/ http.StatusBadGateway, `{"code":502,"message":"Bad Gateway - sample error content"}`},
274272

275273
{"503 Service Unavailable",
276274
/*input*/ "POST", 503, "Service Unavailable - sample error content",
277-
/*method under test*/ (*resp.Response).ServiceUnavailable,
275+
/*method under test*/ (*Response).ServiceUnavailable,
278276
/*expected*/ http.StatusServiceUnavailable, `{"code":503,"message":"Service Unavailable - sample error content"}`},
279277
{"504 Gateway Timeout",
280278
/*input*/ "POST", 504, "Gateway Timeout - sample error content",
281-
/*method under test*/ (*resp.Response).GatewayTimeout,
279+
/*method under test*/ (*Response).GatewayTimeout,
282280
/*expected*/ http.StatusGatewayTimeout, `{"code":504,"message":"Gateway Timeout - sample error content"}`},
283281
}
284282

@@ -292,7 +290,7 @@ func TestErrorResponses(t *testing.T) {
292290

293291
rr := httptest.NewRecorder()
294292
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
295-
resp := resp.NewResponse(w)
293+
resp := NewResponse(w)
296294
datum.methodUnderTest(resp, &Error{datum.inputHttpCode, datum.inputJsonData})
297295
})
298296
handler.ServeHTTP(rr, req)

‎response_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package respond_test
1+
package respond
22

33
import (
44
"errors"
@@ -84,7 +84,7 @@ func TestContentTypeHeader(t *testing.T) {
8484

8585
rr := httptest.NewRecorder()
8686
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
87-
resp.NewResponse(w).
87+
NewResponse(w).
8888
Ok(nil)
8989
})
9090
handler.ServeHTTP(rr, req)
@@ -102,7 +102,7 @@ func TestAddHeader(t *testing.T) {
102102

103103
rr := httptest.NewRecorder()
104104
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
105-
resp.NewResponse(w).
105+
NewResponse(w).
106106
AddHeader("foo", "bar").
107107
AddHeader("ping", "pong").
108108
Ok(nil)
@@ -125,7 +125,7 @@ func TestDeleteHeader(t *testing.T) {
125125

126126
rr := httptest.NewRecorder()
127127
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
128-
res := resp.NewResponse(w)
128+
res := NewResponse(w)
129129

130130
res.AddHeader("foo", "bar").
131131
Ok(nil)

‎success_test.go‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
package respond_test
1+
package respond
22

33
import (
44
"net/http"
55
"net/http/httptest"
66
"testing"
7-
8-
resp "github.com/nicklaw5/go-respond"
97
)
108

119
func TestOk(t *testing.T) {
@@ -15,7 +13,7 @@ func TestOk(t *testing.T) {
1513

1614
rr := httptest.NewRecorder()
1715
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
18-
resp.NewResponse(w).
16+
NewResponse(w).
1917
Ok(nil)
2018
})
2119
handler.ServeHTTP(rr, req)
@@ -47,7 +45,7 @@ func TestCreated(t *testing.T) {
4745
{2, "Joan", "joan@example.com"},
4846
}
4947

50-
resp.NewResponse(w).
48+
NewResponse(w).
5149
Created(users)
5250
})
5351
handler.ServeHTTP(rr, req)
@@ -70,7 +68,7 @@ func TestAccepted(t *testing.T) {
7068

7169
rr := httptest.NewRecorder()
7270
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
73-
res := resp.NewResponse(w)
71+
res := NewResponse(w)
7472
res.Accepted(nil)
7573
})
7674
handler.ServeHTTP(rr, req)
@@ -91,7 +89,7 @@ func TestNoContent(t *testing.T) {
9189

9290
rr := httptest.NewRecorder()
9391
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
94-
res := resp.NewResponse(w)
92+
res := NewResponse(w)
9593
res.NoContent()
9694
})
9795
handler.ServeHTTP(rr, req)

0 commit comments

Comments
 (0)