Fix Mux.Find returning partial path for failing cases

go-chi · Sep 23, 2024 · 5a7133e · 5a7133e
1 parent e470ce0
commit 5a7133e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/mux.go b/mux.go
@@ -388,6 +388,10 @@ func (mx *Mux) Find(rctx *Context, method, path string) string {
 
 		rctx.RoutePath = mx.nextRoutePath(rctx)
 		subPattern := node.subroutes.Find(rctx, method, rctx.RoutePath)
+		if subPattern == "" {
+			return ""
+		}
+
 		pattern = strings.TrimSuffix(pattern, "/*")
 		pattern += subPattern
 	}

diff --git a/mux_test.go b/mux_test.go
@@ -1894,12 +1894,7 @@ func TestMuxFind(t *testing.T) {
 	}
 
 	tctx.Reset()
-	if r.Find(tctx, "GET", "/") != "/" {
-		t.Fatal("expecting to find pattern / for route: GET /")
-	}
-
-	tctx.Reset()
-	if r.Find(tctx, "GET", "/nope") == "/nope" {
+	if r.Find(tctx, "GET", "/nope") != "" {
 		t.Fatal("not expecting to find pattern for route: GET /nope")
 	}
 
@@ -1909,7 +1904,7 @@ func TestMuxFind(t *testing.T) {
 	}
 
 	tctx.Reset()
-	if r.Find(tctx, "HEAD", "/articles/10") == "/articles/{id}" {
+	if r.Find(tctx, "HEAD", "/articles/10") != "" {
 		t.Fatal("not expecting to find pattern for route: HEAD /articles/10")
 	}