zev/mux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace rr.HeaderMap by rr.Header() (#443)

Browse Source
This commit is contained in:
moeryomenko
2019-01-25 19:05:53 +03:00
committed by Matt Silverlock
parent 797e653da6
commit a7962380ca
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
middleware_test.go
View File

@@ -151,7 +151,7 @@ func TestMiddlewareExecution(t *testing.T) {
// Test handler-only call // Test handler-only call
router.ServeHTTP(rw, req) 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") t.Fatal("Handler response is not what it should be")
} }
@@ -166,7 +166,7 @@ func TestMiddlewareExecution(t *testing.T) {
}) })
router.ServeHTTP(rw, req) 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") t.Fatal("Middleware + handler response is not what it should be")
} }
} }
@@ -368,7 +368,7 @@ func TestCORSMethodMiddleware(t *testing.T) {
t.Errorf("Expected body '%s', found '%s'", tt.response, rr.Body.String()) 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 { if allowedMethods != tt.expectedAllowedMethods {
t.Errorf("Expected Access-Control-Allow-Methods '%s', found '%s'", tt.expectedAllowedMethods, allowedMethods) t.Errorf("Expected Access-Control-Allow-Methods '%s', found '%s'", tt.expectedAllowedMethods, allowedMethods)

5
mux_test.go
View File

@@ -1123,10 +1123,7 @@ func TestSchemes(t *testing.T) {
func TestMatcherFunc(t *testing.T) { func TestMatcherFunc(t *testing.T) {
m := func(r *http.Request, m *RouteMatch) bool { m := func(r *http.Request, m *RouteMatch) bool {
if r.URL.Host == "aaa.bbb.ccc" { return r.URL.Host == "aaa.bbb.ccc"
return true
}
return false
} }
tests := []routeTest{ tests := []routeTest{