Prefer scheme on child route when building URLs.

containous · Jul 4, 2017 · ac112f7 · ac112f7
1 parent 37b3a6c
commit ac112f7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/mux_test.go b/mux_test.go
@@ -1226,6 +1226,17 @@ func TestSubRouter(t *testing.T) {
 			hostTemplate: `google.com`,
 			shouldMatch:  true,
 		},
+		{
+			title:        "Prefer scheme on child route when building URLs",
+			route:        new(Route).Schemes("https", "ftp").Host("google.com").Subrouter().Schemes("ftp").Path("/"),
+			request:      newRequest("GET", "ftp://google.com/"),
+			scheme:       "ftp",
+			host:         "google.com",
+			path:         "/",
+			pathTemplate: `/`,
+			hostTemplate: `google.com`,
+			shouldMatch:  true,
+		},
 	}
 
 	for _, test := range tests {

diff --git a/route.go b/route.go
@@ -396,7 +396,7 @@ func (r *Route) Schemes(schemes ...string) *Route {
 	for k, v := range schemes {
 		schemes[k] = strings.ToLower(v)
 	}
-	if r.getBuildScheme() == "" && len(schemes) > 0 {
+	if r.buildScheme == "" && len(schemes) > 0 {
 		r.buildScheme = schemes[0]
 	}
 	return r.addMatcher(schemeMatcher(schemes))