Merge pull request #189 from arran4/codex/add-edge-case-tests-and-fix-issues

Fix JoinURL trailing slash handling and add edge-case tests

Author: arran4

urlutils.go

@@ -6,7 +6,7 @@ import "strings"
 // Additional leading or trailing slashes are removed from elem.
 func JoinURL(base, elem string) string {
 	base = strings.TrimRight(base, "/")
-	elem = strings.TrimLeft(elem, "/")
+	elem = strings.Trim(elem, "/")
 	if base == "" {
 		return "/" + elem
 	}

urlutils_test.go

@@ -12,6 +12,8 @@ func TestJoinURL(t *testing.T) {
 		{"http://example.com/", "oauth2Callback", "http://example.com/oauth2Callback"},
 		{"http://example.com///", "oauth2Callback", "http://example.com/oauth2Callback"},
 		{"http://example.com/base", "oauth2Callback", "http://example.com/base/oauth2Callback"},
+		{"http://example.com/base/", "/oauth2Callback///", "http://example.com/base/oauth2Callback"},
+		{"", "///oauth2Callback///", "/oauth2Callback"},
 	}
 	for _, tt := range tests {
 		got := JoinURL(tt.base, tt.elem)