Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions router.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@ import (
// wildcards (path variables).
type Handle func(http.ResponseWriter, *http.Request, Params)

// ServeHTTP calls h(w, r, ps)
func (h Handle) ServeHTTP(w http.ResponseWriter, r *http.Request, ps Params) {
h(w, r, ps)
}

// Param is a single URL parameter, consisting of a key and a value.
type Param struct {
Key string
Expand Down
30 changes: 30 additions & 0 deletions router_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -638,3 +638,33 @@ func TestRouterServeFiles(t *testing.T) {
t.Error("serving file failed")
}
}

func TestHandleWithMiddleware(t *testing.T) {
router := New()
testServer := httptest.NewServer(router)
defer testServer.Close()

isCalled := false
mockHandle := func(w http.ResponseWriter, r *http.Request, p Params) {
isCalled = true
}

middleware := func(h Handle) Handle {
return func(w http.ResponseWriter, r *http.Request, p Params) {
h.ServeHTTP(w, r, p)
}
}

router.Handle("GET", "/", middleware(mockHandle))

req, _ := http.NewRequest("GET", testServer.URL+"/", nil)
client := new(http.Client)
_, err := client.Do(req)
if err != nil {
t.Error("test request was failed")
}

if !isCalled {
t.Error("calling handle in middleware failed")
}
}