Skip to content

Commit

Permalink
replace rr.HeaderMap by rr.Header() (#443)
Browse files Browse the repository at this point in the history
  • Loading branch information
moeryomenko authored and elithrar committed Jan 25, 2019
1 parent 797e653 commit a796238
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
6 changes: 3 additions & 3 deletions middleware_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ func TestMiddlewareExecution(t *testing.T) {
// Test handler-only call
router.ServeHTTP(rw, req)

if bytes.Compare(rw.Body.Bytes(), handlerStr) != 0 {
if !bytes.Equal(rw.Body.Bytes(), handlerStr) {
t.Fatal("Handler response is not what it should be")
}

Expand All @@ -166,7 +166,7 @@ func TestMiddlewareExecution(t *testing.T) {
})

router.ServeHTTP(rw, req)
if bytes.Compare(rw.Body.Bytes(), append(mwStr, handlerStr...)) != 0 {
if !bytes.Equal(rw.Body.Bytes(), append(mwStr, handlerStr...)) {
t.Fatal("Middleware + handler response is not what it should be")
}
}
Expand Down Expand Up @@ -368,7 +368,7 @@ func TestCORSMethodMiddleware(t *testing.T) {
t.Errorf("Expected body '%s', found '%s'", tt.response, rr.Body.String())
}

allowedMethods := rr.HeaderMap.Get("Access-Control-Allow-Methods")
allowedMethods := rr.Header().Get("Access-Control-Allow-Methods")

if allowedMethods != tt.expectedAllowedMethods {
t.Errorf("Expected Access-Control-Allow-Methods '%s', found '%s'", tt.expectedAllowedMethods, allowedMethods)
Expand Down
5 changes: 1 addition & 4 deletions mux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1123,10 +1123,7 @@ func TestSchemes(t *testing.T) {

func TestMatcherFunc(t *testing.T) {
m := func(r *http.Request, m *RouteMatch) bool {
if r.URL.Host == "aaa.bbb.ccc" {
return true
}
return false
return r.URL.Host == "aaa.bbb.ccc"
}

tests := []routeTest{
Expand Down

0 comments on commit a796238

Please sign in to comment.