Fix Route function to avoid middleware duplication (#22)

chirouter/wrapper.go

@@ -69,7 +69,7 @@ func (r *Wrapper) Route(pattern string, fn func(r chi.Router)) chi.Router {
 		fn(subRouter)
 	}
 
-	r.Mount(pattern, subRouter)
+	r.Router.Mount(pattern, subRouter)
 
 	return subRouter
 }

chirouter/wrapper_test.go

@@ -42,14 +42,15 @@ func TestNewWrapper(t *testing.T) {
 		return http.HandlerFunc(handler.ServeHTTP)
 	})
 
-	r.Use(func(handler http.Handler) http.Handler {
-		var foo interface{ Foo() }
-		if nethttp.HandlerAs(handler, &foo) {
-			return HandlerWithBar{Handler: handler}
-		}
+	mw := func(handler http.Handler) http.Handler {
+		var bar interface{ Bar() }
 
-		return handler
-	})
+		assert.False(t, nethttp.HandlerAs(handler, &bar))
+
+		return HandlerWithBar{Handler: handler}
+	}
+
+	r.Use(mw)
 
 	r.Group(func(r chi.Router) {
 		r.Method(http.MethodPost,
@@ -62,6 +63,8 @@ func TestNewWrapper(t *testing.T) {
 		)
 	})
 
+	r.Mount("/mount", http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {}))
+
 	r.Route("/deeper/", func(r chi.Router) {
 		r.Use(func(handler http.Handler) http.Handler {
 			return handler
@@ -82,11 +85,13 @@ func TestNewWrapper(t *testing.T) {
 		r.Handle("/bar", http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {}))
 	})
 
-	req, err := http.NewRequest(http.MethodPost, "/baz/123/", nil)
-	require.NoError(t, err)
+	for _, u := range []string{"/baz/123/", "/deeper/foo", "/mount/abc"} {
+		req, err := http.NewRequest(http.MethodPost, u, nil)
+		require.NoError(t, err)
 
-	rw := httptest.NewRecorder()
-	r.ServeHTTP(rw, req)
+		rw := httptest.NewRecorder()
+		r.ServeHTTP(rw, req)
 
-	assert.Equal(t, "bar", rw.Body.String())
+		assert.Equal(t, "bar", rw.Body.String(), u)
+	}
 }

nethttp/wrap.go

@@ -21,6 +21,7 @@ func WrapHandler(h http.Handler, mw ...func(http.Handler) http.Handler) http.Han
 		h = &wrappedHandler{
 			Handler: w,
 			wrapped: h,
+			mwName:  runtime.FuncForPC(reflect.ValueOf(mw[i]).Pointer()).Name(),
 		}
 	}
 
@@ -81,4 +82,5 @@ var handlerType = reflect.TypeOf((*http.Handler)(nil)).Elem()
 type wrappedHandler struct {
 	http.Handler
 	wrapped http.Handler
+	mwName  string
 }