Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| ... | ... |
@@ -23,7 +23,7 @@ func TestBoolValue(t *testing.T) {
|
| 23 | 23 |
for c, e := range cases {
|
| 24 | 24 |
v := url.Values{}
|
| 25 | 25 |
v.Set("test", c)
|
| 26 |
- r, _ := http.NewRequest("POST", "", nil)
|
|
| 26 |
+ r, _ := http.NewRequest(http.MethodPost, "", nil) |
|
| 27 | 27 |
r.Form = v |
| 28 | 28 |
|
| 29 | 29 |
a := BoolValue(r, "test") |
| ... | ... |
@@ -34,14 +34,14 @@ func TestBoolValue(t *testing.T) {
|
| 34 | 34 |
} |
| 35 | 35 |
|
| 36 | 36 |
func TestBoolValueOrDefault(t *testing.T) {
|
| 37 |
- r, _ := http.NewRequest("GET", "", nil)
|
|
| 37 |
+ r, _ := http.NewRequest(http.MethodGet, "", nil) |
|
| 38 | 38 |
if !BoolValueOrDefault(r, "queryparam", true) {
|
| 39 | 39 |
t.Fatal("Expected to get true default value, got false")
|
| 40 | 40 |
} |
| 41 | 41 |
|
| 42 | 42 |
v := url.Values{}
|
| 43 | 43 |
v.Set("param", "")
|
| 44 |
- r, _ = http.NewRequest("GET", "", nil)
|
|
| 44 |
+ r, _ = http.NewRequest(http.MethodGet, "", nil) |
|
| 45 | 45 |
r.Form = v |
| 46 | 46 |
if BoolValueOrDefault(r, "param", true) {
|
| 47 | 47 |
t.Fatal("Expected not to get true")
|
| ... | ... |
@@ -59,7 +59,7 @@ func TestInt64ValueOrZero(t *testing.T) {
|
| 59 | 59 |
for c, e := range cases {
|
| 60 | 60 |
v := url.Values{}
|
| 61 | 61 |
v.Set("test", c)
|
| 62 |
- r, _ := http.NewRequest("POST", "", nil)
|
|
| 62 |
+ r, _ := http.NewRequest(http.MethodPost, "", nil) |
|
| 63 | 63 |
r.Form = v |
| 64 | 64 |
|
| 65 | 65 |
a := Int64ValueOrZero(r, "test") |
| ... | ... |
@@ -79,7 +79,7 @@ func TestInt64ValueOrDefault(t *testing.T) {
|
| 79 | 79 |
for c, e := range cases {
|
| 80 | 80 |
v := url.Values{}
|
| 81 | 81 |
v.Set("test", c)
|
| 82 |
- r, _ := http.NewRequest("POST", "", nil)
|
|
| 82 |
+ r, _ := http.NewRequest(http.MethodPost, "", nil) |
|
| 83 | 83 |
r.Form = v |
| 84 | 84 |
|
| 85 | 85 |
a, err := Int64ValueOrDefault(r, "test", -1) |
| ... | ... |
@@ -95,7 +95,7 @@ func TestInt64ValueOrDefault(t *testing.T) {
|
| 95 | 95 |
func TestInt64ValueOrDefaultWithError(t *testing.T) {
|
| 96 | 96 |
v := url.Values{}
|
| 97 | 97 |
v.Set("test", "invalid")
|
| 98 |
- r, _ := http.NewRequest("POST", "", nil)
|
|
| 98 |
+ r, _ := http.NewRequest(http.MethodPost, "", nil) |
|
| 99 | 99 |
r.Form = v |
| 100 | 100 |
|
| 101 | 101 |
_, err := Int64ValueOrDefault(r, "test", -1) |
| ... | ... |
@@ -18,7 +18,7 @@ func DebugRequestMiddleware(handler func(ctx context.Context, w http.ResponseWri |
| 18 | 18 |
return func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
|
| 19 | 19 |
logrus.Debugf("Calling %s %s", r.Method, r.RequestURI)
|
| 20 | 20 |
|
| 21 |
- if r.Method != "POST" {
|
|
| 21 |
+ if r.Method != http.MethodPost {
|
|
| 22 | 22 |
return handler(ctx, w, r, vars) |
| 23 | 23 |
} |
| 24 | 24 |
if err := httputils.CheckForJSON(r); err != nil {
|
| ... | ... |
@@ -25,7 +25,7 @@ func TestVersionMiddlewareVersion(t *testing.T) {
|
| 25 | 25 |
m := NewVersionMiddleware(defaultVersion, defaultVersion, minVersion) |
| 26 | 26 |
h := m.WrapHandler(handler) |
| 27 | 27 |
|
| 28 |
- req, _ := http.NewRequest("GET", "/containers/json", nil)
|
|
| 28 |
+ req, _ := http.NewRequest(http.MethodGet, "/containers/json", nil) |
|
| 29 | 29 |
resp := httptest.NewRecorder() |
| 30 | 30 |
ctx := context.Background() |
| 31 | 31 |
|
| ... | ... |
@@ -76,7 +76,7 @@ func TestVersionMiddlewareWithErrorsReturnsHeaders(t *testing.T) {
|
| 76 | 76 |
m := NewVersionMiddleware(defaultVersion, defaultVersion, minVersion) |
| 77 | 77 |
h := m.WrapHandler(handler) |
| 78 | 78 |
|
| 79 |
- req, _ := http.NewRequest("GET", "/containers/json", nil)
|
|
| 79 |
+ req, _ := http.NewRequest(http.MethodGet, "/containers/json", nil) |
|
| 80 | 80 |
resp := httptest.NewRecorder() |
| 81 | 81 |
ctx := context.Background() |
| 82 | 82 |
|
| ... | ... |
@@ -22,7 +22,7 @@ func TestMiddlewares(t *testing.T) {
|
| 22 | 22 |
|
| 23 | 23 |
srv.UseMiddleware(middleware.NewVersionMiddleware("0.1omega2", api.DefaultVersion, api.MinVersion))
|
| 24 | 24 |
|
| 25 |
- req, _ := http.NewRequest("GET", "/containers/json", nil)
|
|
| 25 |
+ req, _ := http.NewRequest(http.MethodGet, "/containers/json", nil) |
|
| 26 | 26 |
resp := httptest.NewRecorder() |
| 27 | 27 |
ctx := context.Background() |
| 28 | 28 |
|