Skip to content

Commit

Permalink
Adapt tests to go lint changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Jackymancs4 committed May 12, 2021
1 parent d0d4f7e commit 0534bd7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func getPage(values url.Values) (int, int) {
func getAuthenticatedBasket(w http.ResponseWriter, r *http.Request, ps httprouter.Params) (string, Basket) {
name := ps.ByName("basket")
if !validBasketName.MatchString(name) {
http.Error(w, "Invalid basket name; ["+name+"] does not match pattern: "+validBasketName.String(), http.StatusBadRequest)
http.Error(w, "invalid basket name; ["+name+"] does not match pattern: "+validBasketName.String(), http.StatusBadRequest)
} else if basket := basketsDb.Get(name); basket != nil {
// maybe custom header, e.g. basket_key, basket_token
if token := r.Header.Get("Authorization"); basket.Authorize(token) || token == serverConfig.MasterToken {
Expand Down Expand Up @@ -190,7 +190,7 @@ func CreateBasket(w http.ResponseWriter, r *http.Request, ps httprouter.Params)
return
}
if !validBasketName.MatchString(name) {
http.Error(w, "Invalid basket name; ["+name+"] does not match pattern: "+validBasketName.String(), http.StatusBadRequest)
http.Error(w, "invalid basket name; ["+name+"] does not match pattern: "+validBasketName.String(), http.StatusBadRequest)
return
}

Expand Down Expand Up @@ -373,7 +373,7 @@ func AcceptBasketRequests(w http.ResponseWriter, r *http.Request) {
name := strings.Split(r.URL.Path, "/")[1]

if !validBasketName.MatchString(name) {
http.Error(w, "Invalid basket name; ["+name+"] does not match pattern: "+validBasketName.String(), http.StatusBadRequest)
http.Error(w, "invalid basket name; ["+name+"] does not match pattern: "+validBasketName.String(), http.StatusBadRequest)
} else if basket := basketsDb.Get(name); basket != nil {
request := basket.Add(r)

Expand Down
2 changes: 1 addition & 1 deletion handlers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,7 @@ func TestAcceptBasketRequests_BadRequest(t *testing.T) {
AcceptBasketRequests(w, req)
// HTTP 400 - Bad Request
assert.Equal(t, 400, w.Code, "wrong HTTP result code")
assert.Equal(t, "Invalid basket name; [accept03 ] does not match pattern: "+validBasketName.String()+"\n", w.Body.String(),
assert.Equal(t, "invalid basket name; [accept03 ] does not match pattern: "+validBasketName.String()+"\n", w.Body.String(),
"wrong error message")
}

Expand Down

0 comments on commit 0534bd7

Please sign in to comment.