Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 25, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions middleware_test.go
View file
Open in desktop
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
View file
Open in desktop
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