Merge pull request #446 from sue445/feature/snippet_hyphen_path

Support snippet routes including `/-/` for GitLab 13.3.0+
sue445 · Oct 25, 2020 · 1b39e8b · 1b39e8b
2 parents e0148a6 + d9aa88a
commit 1b39e8b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/gitlab/snippet_fetcher.go b/gitlab/snippet_fetcher.go
@@ -14,7 +14,7 @@ type snippetFetcher struct {
 }
 
 func (f *snippetFetcher) fetchPath(path string, client *gitlab.Client, isDebugLogging bool) (*Page, error) {
-	re := regexp.MustCompile("^snippets/(\\d+)")
+	re := regexp.MustCompile("^(?:-/)?snippets/(\\d+)")
 	matched := re.FindStringSubmatch(path)
 
 	if matched == nil {

diff --git a/gitlab/url_parser_test.go b/gitlab/url_parser_test.go
@@ -773,6 +773,24 @@ func TestGitlabUrlParser_FetchURL(t *testing.T) {
 				Color:                  "",
 			},
 		},
+		{
+			name: "Snippet URL (including /-/)",
+			args: args{
+				url: "http://example.com/-/snippets/3",
+			},
+			want: &Page{
+				Title:                  "add.rb",
+				Description:            "```\nputs 'Hello'\n```",
+				AuthorName:             "John Smith",
+				AuthorAvatarURL:        "",
+				AvatarURL:              "",
+				CanTruncateDescription: false,
+				FooterTitle:            "",
+				FooterURL:              "",
+				FooterTime:             tp(time.Date(2012, 6, 28, 10, 52, 4, 0, time.UTC)),
+				Color:                  "",
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {