2018-02-27 07:09:18 +00:00
|
|
|
// Copyright 2018 The Gitea Authors. All rights reserved.
|
2022-11-27 18:20:29 +00:00
|
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
|
2018-02-27 07:09:18 +00:00
|
|
|
package markup
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
|
|
|
"strconv"
|
|
|
|
"strings"
|
|
|
|
"testing"
|
|
|
|
|
|
|
|
"code.gitea.io/gitea/modules/setting"
|
2024-11-14 05:02:11 +00:00
|
|
|
testModule "code.gitea.io/gitea/modules/test"
|
2018-02-27 07:09:18 +00:00
|
|
|
"code.gitea.io/gitea/modules/util"
|
|
|
|
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
)
|
|
|
|
|
2022-01-20 17:46:10 +00:00
|
|
|
const (
|
|
|
|
TestAppURL = "http://localhost:3000/"
|
2024-06-04 12:19:41 +00:00
|
|
|
TestRepoURL = TestAppURL + "test-owner/test-repo/"
|
2022-01-20 17:46:10 +00:00
|
|
|
)
|
2018-02-27 07:09:18 +00:00
|
|
|
|
2022-06-10 05:39:53 +00:00
|
|
|
// externalIssueLink an HTML link to an alphanumeric-style issue
|
|
|
|
func externalIssueLink(baseURL, class, name string) string {
|
2019-09-10 09:03:30 +00:00
|
|
|
return link(util.URLJoin(baseURL, name), class, name)
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// numericLink an HTML to a numeric-style issue
|
2019-12-01 13:57:05 +00:00
|
|
|
func numericIssueLink(baseURL, class string, index int, marker string) string {
|
|
|
|
return link(util.URLJoin(baseURL, strconv.Itoa(index)), class, fmt.Sprintf("%s%d", marker, index))
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// link an HTML link
|
2019-09-10 09:03:30 +00:00
|
|
|
func link(href, class, contents string) string {
|
2024-11-24 08:18:57 +00:00
|
|
|
extra := util.Iif(class != "", ` class="`+class+`"`, "")
|
2024-11-07 03:57:07 +00:00
|
|
|
return fmt.Sprintf(`<a href="%s"%s>%s</a>`, href, extra, contents)
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
var numericMetas = map[string]string{
|
2024-11-16 08:41:44 +00:00
|
|
|
"format": "https://someurl.com/{user}/{repo}/{index}",
|
|
|
|
"user": "someUser",
|
|
|
|
"repo": "someRepo",
|
|
|
|
"style": IssueNameStyleNumeric,
|
|
|
|
"markupAllowShortIssuePattern": "true",
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
var alphanumericMetas = map[string]string{
|
2024-11-16 08:41:44 +00:00
|
|
|
"format": "https://someurl.com/{user}/{repo}/{index}",
|
|
|
|
"user": "someUser",
|
|
|
|
"repo": "someRepo",
|
|
|
|
"style": IssueNameStyleAlphanumeric,
|
|
|
|
"markupAllowShortIssuePattern": "true",
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
|
2022-06-10 05:39:53 +00:00
|
|
|
var regexpMetas = map[string]string{
|
|
|
|
"format": "https://someurl.com/{user}/{repo}/{index}",
|
|
|
|
"user": "someUser",
|
|
|
|
"repo": "someRepo",
|
|
|
|
"style": IssueNameStyleRegexp,
|
|
|
|
}
|
|
|
|
|
2021-12-11 17:21:36 +00:00
|
|
|
// these values should match the TestOrgRepo const above
|
2019-04-12 05:53:34 +00:00
|
|
|
var localMetas = map[string]string{
|
2024-11-16 08:41:44 +00:00
|
|
|
"user": "test-owner",
|
|
|
|
"repo": "test-repo",
|
|
|
|
"markupAllowShortIssuePattern": "true",
|
|
|
|
}
|
|
|
|
|
2018-02-27 07:09:18 +00:00
|
|
|
func TestRender_IssueIndexPattern(t *testing.T) {
|
|
|
|
// numeric: render inputs without valid mentions
|
|
|
|
test := func(s string) {
|
2024-11-24 08:18:57 +00:00
|
|
|
testRenderIssueIndexPattern(t, s, s, NewTestRenderContext())
|
|
|
|
testRenderIssueIndexPattern(t, s, s, NewTestRenderContext(numericMetas))
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// should not render anything when there are no mentions
|
|
|
|
test("")
|
|
|
|
test("this is a test")
|
|
|
|
test("test 123 123 1234")
|
|
|
|
test("#")
|
|
|
|
test("# # #")
|
|
|
|
test("# 123")
|
|
|
|
test("#abcd")
|
|
|
|
test("test#1234")
|
|
|
|
test("#1234test")
|
2019-12-01 13:57:05 +00:00
|
|
|
test("#abcd")
|
|
|
|
test("test!1234")
|
|
|
|
test("!1234test")
|
|
|
|
test(" test !1234test")
|
2019-04-07 11:18:16 +00:00
|
|
|
test("/home/gitea/#1234")
|
2019-12-01 13:57:05 +00:00
|
|
|
test("/home/gitea/!1234")
|
2018-02-27 07:09:18 +00:00
|
|
|
|
|
|
|
// should not render issue mention without leading space
|
|
|
|
test("test#54321 issue")
|
|
|
|
|
|
|
|
// should not render issue mention without trailing space
|
|
|
|
test("test #54321issue")
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestRender_IssueIndexPattern2(t *testing.T) {
|
2021-12-11 17:21:36 +00:00
|
|
|
setting.AppURL = TestAppURL
|
2018-02-27 07:09:18 +00:00
|
|
|
|
|
|
|
// numeric: render inputs with valid mentions
|
2019-12-01 13:57:05 +00:00
|
|
|
test := func(s, expectedFmt, marker string, indices ...int) {
|
|
|
|
var path, prefix string
|
2021-09-15 08:45:27 +00:00
|
|
|
isExternal := false
|
2019-12-01 13:57:05 +00:00
|
|
|
if marker == "!" {
|
|
|
|
path = "pulls"
|
|
|
|
prefix = "http://localhost:3000/someUser/someRepo/pulls/"
|
|
|
|
} else {
|
|
|
|
path = "issues"
|
|
|
|
prefix = "https://someurl.com/someUser/someRepo/"
|
2021-09-15 08:45:27 +00:00
|
|
|
isExternal = true
|
2019-12-01 13:57:05 +00:00
|
|
|
}
|
|
|
|
|
2023-07-04 18:36:08 +00:00
|
|
|
links := make([]any, len(indices))
|
2018-02-27 07:09:18 +00:00
|
|
|
for i, index := range indices {
|
2021-12-11 17:21:36 +00:00
|
|
|
links[i] = numericIssueLink(util.URLJoin(TestRepoURL, path), "ref-issue", index, marker)
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
expectedNil := fmt.Sprintf(expectedFmt, links...)
|
2024-11-24 08:18:57 +00:00
|
|
|
testRenderIssueIndexPattern(t, s, expectedNil, NewTestRenderContext(TestAppURL, localMetas))
|
2018-02-27 07:09:18 +00:00
|
|
|
|
2021-09-15 08:45:27 +00:00
|
|
|
class := "ref-issue"
|
|
|
|
if isExternal {
|
|
|
|
class += " ref-external-issue"
|
|
|
|
}
|
|
|
|
|
2018-02-27 07:09:18 +00:00
|
|
|
for i, index := range indices {
|
2021-09-15 08:45:27 +00:00
|
|
|
links[i] = numericIssueLink(prefix, class, index, marker)
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
expectedNum := fmt.Sprintf(expectedFmt, links...)
|
2024-11-24 08:18:57 +00:00
|
|
|
testRenderIssueIndexPattern(t, s, expectedNum, NewTestRenderContext(TestAppURL, numericMetas))
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// should render freestanding mentions
|
2019-12-01 13:57:05 +00:00
|
|
|
test("#1234 test", "%s test", "#", 1234)
|
|
|
|
test("test #8 issue", "test %s issue", "#", 8)
|
|
|
|
test("!1234 test", "%s test", "!", 1234)
|
|
|
|
test("test !8 issue", "test %s issue", "!", 8)
|
|
|
|
test("test issue #1234", "test issue %s", "#", 1234)
|
|
|
|
test("fixes issue #1234.", "fixes issue %s.", "#", 1234)
|
2018-02-27 07:09:18 +00:00
|
|
|
|
2019-04-07 11:18:16 +00:00
|
|
|
// should render mentions in parentheses / brackets
|
2019-12-01 13:57:05 +00:00
|
|
|
test("(#54321 issue)", "(%s issue)", "#", 54321)
|
|
|
|
test("[#54321 issue]", "[%s issue]", "#", 54321)
|
|
|
|
test("test (#9801 extra) issue", "test (%s extra) issue", "#", 9801)
|
|
|
|
test("test (!9801 extra) issue", "test (%s extra) issue", "!", 9801)
|
|
|
|
test("test (#1)", "test (%s)", "#", 1)
|
2018-02-27 07:09:18 +00:00
|
|
|
|
|
|
|
// should render multiple issue mentions in the same line
|
2019-12-01 13:57:05 +00:00
|
|
|
test("#54321 #1243", "%s %s", "#", 54321, 1243)
|
|
|
|
test("wow (#54321 #1243)", "wow (%s %s)", "#", 54321, 1243)
|
|
|
|
test("(#4)(#5)", "(%s)(%s)", "#", 4, 5)
|
|
|
|
test("#1 (#4321) test", "%s (%s) test", "#", 1, 4321)
|
2019-09-06 00:39:54 +00:00
|
|
|
|
|
|
|
// should render with :
|
2019-12-01 13:57:05 +00:00
|
|
|
test("#1234: test", "%s: test", "#", 1234)
|
|
|
|
test("wow (#54321: test)", "wow (%s: test)", "#", 54321)
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestRender_IssueIndexPattern3(t *testing.T) {
|
2021-12-11 17:21:36 +00:00
|
|
|
setting.AppURL = TestAppURL
|
2018-02-27 07:09:18 +00:00
|
|
|
|
|
|
|
// alphanumeric: render inputs without valid mentions
|
|
|
|
test := func(s string) {
|
2024-11-24 08:18:57 +00:00
|
|
|
testRenderIssueIndexPattern(t, s, s, NewTestRenderContext(alphanumericMetas))
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
test("")
|
|
|
|
test("this is a test")
|
|
|
|
test("test 123 123 1234")
|
|
|
|
test("#")
|
|
|
|
test("# 123")
|
|
|
|
test("#abcd")
|
|
|
|
test("test #123")
|
|
|
|
test("abc-1234") // issue prefix must be capital
|
|
|
|
test("ABc-1234") // issue prefix must be _all_ capital
|
|
|
|
test("ABCDEFGHIJK-1234") // the limit is 10 characters in the prefix
|
|
|
|
test("ABC1234") // dash is required
|
|
|
|
test("test ABC- test") // number is required
|
|
|
|
test("test -1234 test") // prefix is required
|
|
|
|
test("testABC-123 test") // leading space is required
|
|
|
|
test("test ABC-123test") // trailing space is required
|
|
|
|
test("ABC-0123") // no leading zero
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestRender_IssueIndexPattern4(t *testing.T) {
|
2021-12-11 17:21:36 +00:00
|
|
|
setting.AppURL = TestAppURL
|
2018-02-27 07:09:18 +00:00
|
|
|
|
|
|
|
// alphanumeric: render inputs with valid mentions
|
|
|
|
test := func(s, expectedFmt string, names ...string) {
|
2023-07-04 18:36:08 +00:00
|
|
|
links := make([]any, len(names))
|
2018-02-27 07:09:18 +00:00
|
|
|
for i, name := range names {
|
2022-06-10 05:39:53 +00:00
|
|
|
links[i] = externalIssueLink("https://someurl.com/someUser/someRepo/", "ref-issue ref-external-issue", name)
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
expected := fmt.Sprintf(expectedFmt, links...)
|
2024-11-24 08:18:57 +00:00
|
|
|
testRenderIssueIndexPattern(t, s, expected, NewTestRenderContext(alphanumericMetas))
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
test("OTT-1234 test", "%s test", "OTT-1234")
|
|
|
|
test("test T-12 issue", "test %s issue", "T-12")
|
|
|
|
test("test issue ABCDEFGHIJ-1234567890", "test issue %s", "ABCDEFGHIJ-1234567890")
|
|
|
|
}
|
|
|
|
|
2022-06-10 05:39:53 +00:00
|
|
|
func TestRender_IssueIndexPattern5(t *testing.T) {
|
|
|
|
setting.AppURL = TestAppURL
|
|
|
|
|
|
|
|
// regexp: render inputs without valid mentions
|
|
|
|
test := func(s, expectedFmt, pattern string, ids, names []string) {
|
|
|
|
metas := regexpMetas
|
|
|
|
metas["regexp"] = pattern
|
2023-07-04 18:36:08 +00:00
|
|
|
links := make([]any, len(ids))
|
2022-06-10 05:39:53 +00:00
|
|
|
for i, id := range ids {
|
|
|
|
links[i] = link(util.URLJoin("https://someurl.com/someUser/someRepo/", id), "ref-issue ref-external-issue", names[i])
|
|
|
|
}
|
|
|
|
|
|
|
|
expected := fmt.Sprintf(expectedFmt, links...)
|
2024-11-24 08:18:57 +00:00
|
|
|
testRenderIssueIndexPattern(t, s, expected, NewTestRenderContext(metas))
|
2022-06-10 05:39:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
test("abc ISSUE-123 def", "abc %s def",
|
|
|
|
"ISSUE-(\\d+)",
|
|
|
|
[]string{"123"},
|
|
|
|
[]string{"ISSUE-123"},
|
|
|
|
)
|
|
|
|
|
|
|
|
test("abc (ISSUE 123) def", "abc %s def",
|
|
|
|
"\\(ISSUE (\\d+)\\)",
|
|
|
|
[]string{"123"},
|
|
|
|
[]string{"(ISSUE 123)"},
|
|
|
|
)
|
|
|
|
|
|
|
|
test("abc ISSUE-123 def", "abc %s def",
|
|
|
|
"(ISSUE-(\\d+))",
|
|
|
|
[]string{"ISSUE-123"},
|
|
|
|
[]string{"ISSUE-123"},
|
|
|
|
)
|
|
|
|
|
2024-11-24 08:18:57 +00:00
|
|
|
testRenderIssueIndexPattern(t, "will not match", "will not match", NewTestRenderContext(regexpMetas))
|
2022-06-10 05:39:53 +00:00
|
|
|
}
|
|
|
|
|
2024-11-16 08:41:44 +00:00
|
|
|
func TestRender_IssueIndexPattern_NoShortPattern(t *testing.T) {
|
2023-08-07 13:11:25 +00:00
|
|
|
setting.AppURL = TestAppURL
|
|
|
|
metas := map[string]string{
|
|
|
|
"format": "https://someurl.com/{user}/{repo}/{index}",
|
|
|
|
"user": "someUser",
|
|
|
|
"repo": "someRepo",
|
|
|
|
"style": IssueNameStyleNumeric,
|
|
|
|
}
|
|
|
|
|
2024-11-24 08:18:57 +00:00
|
|
|
testRenderIssueIndexPattern(t, "#1", "#1", NewTestRenderContext(metas))
|
|
|
|
testRenderIssueIndexPattern(t, "#1312", "#1312", NewTestRenderContext(metas))
|
|
|
|
testRenderIssueIndexPattern(t, "!1", "!1", NewTestRenderContext(metas))
|
2023-08-07 13:11:25 +00:00
|
|
|
}
|
|
|
|
|
2024-11-16 08:41:44 +00:00
|
|
|
func TestRender_RenderIssueTitle(t *testing.T) {
|
|
|
|
setting.AppURL = TestAppURL
|
|
|
|
metas := map[string]string{
|
|
|
|
"format": "https://someurl.com/{user}/{repo}/{index}",
|
|
|
|
"user": "someUser",
|
|
|
|
"repo": "someRepo",
|
|
|
|
"style": IssueNameStyleNumeric,
|
|
|
|
}
|
2024-11-24 08:18:57 +00:00
|
|
|
actual, err := RenderIssueTitle(NewTestRenderContext(metas), "#1")
|
2024-11-16 08:41:44 +00:00
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.Equal(t, "#1", actual)
|
|
|
|
}
|
|
|
|
|
2021-04-19 22:25:08 +00:00
|
|
|
func testRenderIssueIndexPattern(t *testing.T, input, expected string, ctx *RenderContext) {
|
|
|
|
var buf strings.Builder
|
|
|
|
err := postProcess(ctx, []processor{issueIndexPatternProcessor}, strings.NewReader(input), &buf)
|
2018-02-27 07:09:18 +00:00
|
|
|
assert.NoError(t, err)
|
2022-06-10 05:39:53 +00:00
|
|
|
assert.Equal(t, expected, buf.String(), "input=%q", input)
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestRender_AutoLink(t *testing.T) {
|
2021-12-11 17:21:36 +00:00
|
|
|
setting.AppURL = TestAppURL
|
2018-02-27 07:09:18 +00:00
|
|
|
|
|
|
|
test := func(input, expected string) {
|
2021-04-19 22:25:08 +00:00
|
|
|
var buffer strings.Builder
|
2024-11-26 16:46:02 +00:00
|
|
|
err := PostProcessDefault(NewTestRenderContext(localMetas), strings.NewReader(input), &buffer)
|
2018-02-27 07:09:18 +00:00
|
|
|
assert.Equal(t, err, nil)
|
2021-04-19 22:25:08 +00:00
|
|
|
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer.String()))
|
|
|
|
|
|
|
|
buffer.Reset()
|
2024-11-26 16:46:02 +00:00
|
|
|
err = PostProcessDefault(NewTestRenderContext(localMetas), strings.NewReader(input), &buffer)
|
2018-02-27 07:09:18 +00:00
|
|
|
assert.Equal(t, err, nil)
|
2021-04-19 22:25:08 +00:00
|
|
|
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer.String()))
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// render valid issue URLs
|
2021-12-11 17:21:36 +00:00
|
|
|
test(util.URLJoin(TestRepoURL, "issues", "3333"),
|
|
|
|
numericIssueLink(util.URLJoin(TestRepoURL, "issues"), "ref-issue", 3333, "#"))
|
2018-02-27 07:09:18 +00:00
|
|
|
|
|
|
|
// render valid commit URLs
|
2021-12-11 17:21:36 +00:00
|
|
|
tmp := util.URLJoin(TestRepoURL, "commit", "d8a994ef243349f321568f9e36d5c3f444b99cae")
|
2019-09-10 09:03:30 +00:00
|
|
|
test(tmp, "<a href=\""+tmp+"\" class=\"commit\"><code class=\"nohighlight\">d8a994ef24</code></a>")
|
2018-02-27 07:09:18 +00:00
|
|
|
tmp += "#diff-2"
|
2019-09-10 09:03:30 +00:00
|
|
|
test(tmp, "<a href=\""+tmp+"\" class=\"commit\"><code class=\"nohighlight\">d8a994ef24 (diff-2)</code></a>")
|
2018-02-27 07:09:18 +00:00
|
|
|
|
|
|
|
// render other commit URLs
|
2019-06-18 22:31:31 +00:00
|
|
|
tmp = "https://external-link.gitea.io/go-gitea/gitea/commit/d8a994ef243349f321568f9e36d5c3f444b99cae#diff-2"
|
2019-09-10 09:03:30 +00:00
|
|
|
test(tmp, "<a href=\""+tmp+"\" class=\"commit\"><code class=\"nohighlight\">d8a994ef24 (diff-2)</code></a>")
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestRender_FullIssueURLs(t *testing.T) {
|
2021-12-11 17:21:36 +00:00
|
|
|
setting.AppURL = TestAppURL
|
2024-11-24 08:18:57 +00:00
|
|
|
defer testModule.MockVariableValue(&RenderBehaviorForTesting.DisableAdditionalAttributes, true)()
|
2018-02-27 07:09:18 +00:00
|
|
|
test := func(input, expected string) {
|
2021-04-19 22:25:08 +00:00
|
|
|
var result strings.Builder
|
2024-11-24 08:18:57 +00:00
|
|
|
err := postProcess(NewTestRenderContext(localMetas), []processor{fullIssuePatternProcessor}, strings.NewReader(input), &result)
|
2018-02-27 07:09:18 +00:00
|
|
|
assert.NoError(t, err)
|
2024-11-14 05:02:11 +00:00
|
|
|
assert.Equal(t, expected, result.String())
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
test("Here is a link https://git.osgeo.org/gogs/postgis/postgis/pulls/6",
|
|
|
|
"Here is a link https://git.osgeo.org/gogs/postgis/postgis/pulls/6")
|
|
|
|
test("Look here http://localhost:3000/person/repo/issues/4",
|
2020-01-20 04:39:21 +00:00
|
|
|
`Look here <a href="http://localhost:3000/person/repo/issues/4" class="ref-issue">person/repo#4</a>`)
|
2018-02-27 07:09:18 +00:00
|
|
|
test("http://localhost:3000/person/repo/issues/4#issuecomment-1234",
|
Append `(comment)` when a link points at a comment rather than the whole issue (#23734)
Close #23671
For the feature mentioned above, this PR append ' (comment)' to the
rendered html if it is a hashcomment.
After the PR, type in the following
```
pull request from other repo:
http://localhost:3000/testOrg/testOrgRepo/pulls/2
pull request from this repo:
http://localhost:3000/aaa/testA/pulls/2
issue comment from this repo:
http://localhost:3000/aaa/testA/issues/1#issuecomment-18
http://localhost:3000/aaa/testA/pulls/2#issue-9
issue comment from other repo:
http://localhost:3000/testOrg/testOrgRepo/pulls/2#issuecomment-24
http://localhost:3000/testOrg/testOrgRepo/pulls/2#issue
```
Gives:
<img width="687" alt="截屏2023-03-27 13 53 06"
src="https://user-images.githubusercontent.com/17645053/227852387-2b218e0d-3468-4d90-ad81-d702ddd17fd2.png">
Other than the above feature, this PR also includes two other changes:
1 Right now, the render of links from file changed tab in pull request
might not be very proper, for example, if type in the following. (not
sure if this is an issue or design, if not an issue, I will revert the
changes). example on
[try.gitea.io](https://try.gitea.io/HesterG/testrepo/pulls/1)
```
https://try.gitea.io/HesterG/testrepo/pulls/1/files#issuecomment-162725
https://try.gitea.io/HesterG/testrepo/pulls/1/files
```
it will render the following
<img width="899" alt="截屏2023-03-24 15 41 37"
src="https://user-images.githubusercontent.com/17645053/227456117-5eccedb7-9118-4540-929d-aee9a76de852.png">
In this PR, skip processing the link into a ref issue if it is a link
from files changed tab in pull request
After:
type in following
```
hash comment on files changed tab:
http://localhost:3000/testOrg/testOrgRepo/pulls/2/files#issuecomment-24
files changed link:
http://localhost:3000/testOrg/testOrgRepo/pulls/2/files
```
Gives
<img width="708" alt="截屏2023-03-27 22 09 02"
src="https://user-images.githubusercontent.com/17645053/227964273-5dc06c50-3713-489c-b05d-d95367d0ab0f.png">
2 Right now, after editing the comment area, there will not be tippys
attached to `ref-issue`; and no tippy attached on preview as well.
example:
https://user-images.githubusercontent.com/17645053/227850540-5ae34e2d-b1d7-4d0d-9726-7701bf825d1f.mov
In this PR, in frontend, make sure tippy is added after editing the
comment, and to the comment on preview tab
After:
https://user-images.githubusercontent.com/17645053/227853777-06f56b4c-1148-467c-b6f7-f79418e67504.mov
2023-04-03 08:02:57 +00:00
|
|
|
`<a href="http://localhost:3000/person/repo/issues/4#issuecomment-1234" class="ref-issue">person/repo#4 (comment)</a>`)
|
2024-06-04 12:19:41 +00:00
|
|
|
test("http://localhost:3000/test-owner/test-repo/issues/4",
|
|
|
|
`<a href="http://localhost:3000/test-owner/test-repo/issues/4" class="ref-issue">#4</a>`)
|
|
|
|
test("http://localhost:3000/test-owner/test-repo/issues/4 test",
|
|
|
|
`<a href="http://localhost:3000/test-owner/test-repo/issues/4" class="ref-issue">#4</a> test`)
|
|
|
|
test("http://localhost:3000/test-owner/test-repo/issues/4?a=1&b=2#comment-123 test",
|
|
|
|
`<a href="http://localhost:3000/test-owner/test-repo/issues/4?a=1&b=2#comment-123" class="ref-issue">#4 (comment)</a> test`)
|
Append `(comment)` when a link points at a comment rather than the whole issue (#23734)
Close #23671
For the feature mentioned above, this PR append ' (comment)' to the
rendered html if it is a hashcomment.
After the PR, type in the following
```
pull request from other repo:
http://localhost:3000/testOrg/testOrgRepo/pulls/2
pull request from this repo:
http://localhost:3000/aaa/testA/pulls/2
issue comment from this repo:
http://localhost:3000/aaa/testA/issues/1#issuecomment-18
http://localhost:3000/aaa/testA/pulls/2#issue-9
issue comment from other repo:
http://localhost:3000/testOrg/testOrgRepo/pulls/2#issuecomment-24
http://localhost:3000/testOrg/testOrgRepo/pulls/2#issue
```
Gives:
<img width="687" alt="截屏2023-03-27 13 53 06"
src="https://user-images.githubusercontent.com/17645053/227852387-2b218e0d-3468-4d90-ad81-d702ddd17fd2.png">
Other than the above feature, this PR also includes two other changes:
1 Right now, the render of links from file changed tab in pull request
might not be very proper, for example, if type in the following. (not
sure if this is an issue or design, if not an issue, I will revert the
changes). example on
[try.gitea.io](https://try.gitea.io/HesterG/testrepo/pulls/1)
```
https://try.gitea.io/HesterG/testrepo/pulls/1/files#issuecomment-162725
https://try.gitea.io/HesterG/testrepo/pulls/1/files
```
it will render the following
<img width="899" alt="截屏2023-03-24 15 41 37"
src="https://user-images.githubusercontent.com/17645053/227456117-5eccedb7-9118-4540-929d-aee9a76de852.png">
In this PR, skip processing the link into a ref issue if it is a link
from files changed tab in pull request
After:
type in following
```
hash comment on files changed tab:
http://localhost:3000/testOrg/testOrgRepo/pulls/2/files#issuecomment-24
files changed link:
http://localhost:3000/testOrg/testOrgRepo/pulls/2/files
```
Gives
<img width="708" alt="截屏2023-03-27 22 09 02"
src="https://user-images.githubusercontent.com/17645053/227964273-5dc06c50-3713-489c-b05d-d95367d0ab0f.png">
2 Right now, after editing the comment area, there will not be tippys
attached to `ref-issue`; and no tippy attached on preview as well.
example:
https://user-images.githubusercontent.com/17645053/227850540-5ae34e2d-b1d7-4d0d-9726-7701bf825d1f.mov
In this PR, in frontend, make sure tippy is added after editing the
comment, and to the comment on preview tab
After:
https://user-images.githubusercontent.com/17645053/227853777-06f56b4c-1148-467c-b6f7-f79418e67504.mov
2023-04-03 08:02:57 +00:00
|
|
|
test("http://localhost:3000/testOrg/testOrgRepo/pulls/2/files#issuecomment-24",
|
|
|
|
"http://localhost:3000/testOrg/testOrgRepo/pulls/2/files#issuecomment-24")
|
|
|
|
test("http://localhost:3000/testOrg/testOrgRepo/pulls/2/files",
|
|
|
|
"http://localhost:3000/testOrg/testOrgRepo/pulls/2/files")
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestRegExp_sha1CurrentPattern(t *testing.T) {
|
|
|
|
trueTestCases := []string{
|
|
|
|
"d8a994ef243349f321568f9e36d5c3f444b99cae",
|
|
|
|
"abcdefabcdefabcdefabcdefabcdefabcdefabcd",
|
2019-04-07 11:18:16 +00:00
|
|
|
"(abcdefabcdefabcdefabcdefabcdefabcdefabcd)",
|
|
|
|
"[abcdefabcdefabcdefabcdefabcdefabcdefabcd]",
|
|
|
|
"abcdefabcdefabcdefabcdefabcdefabcdefabcd.",
|
2024-06-12 22:35:46 +00:00
|
|
|
"abcdefabcdefabcdefabcdefabcdefabcdefabcd:",
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
falseTestCases := []string{
|
|
|
|
"test",
|
|
|
|
"abcdefg",
|
2019-04-07 11:18:16 +00:00
|
|
|
"e59ff077-2d03-4e6b-964d-63fbaea81f",
|
2018-02-27 07:09:18 +00:00
|
|
|
"abcdefghijklmnopqrstuvwxyzabcdefghijklmn",
|
|
|
|
"abcdefghijklmnopqrstuvwxyzabcdefghijklmO",
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, testCase := range trueTestCases {
|
2024-11-16 08:41:44 +00:00
|
|
|
assert.True(t, globalVars().hashCurrentPattern.MatchString(testCase))
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
for _, testCase := range falseTestCases {
|
2024-11-16 08:41:44 +00:00
|
|
|
assert.False(t, globalVars().hashCurrentPattern.MatchString(testCase))
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestRegExp_anySHA1Pattern(t *testing.T) {
|
2024-05-04 01:48:16 +00:00
|
|
|
testCases := map[string]anyHashPatternResult{
|
2018-02-27 07:09:18 +00:00
|
|
|
"https://github.com/jquery/jquery/blob/a644101ed04d0beacea864ce805e0c4f86ba1cd1/test/unit/event.js#L2703": {
|
2024-05-04 01:48:16 +00:00
|
|
|
CommitID: "a644101ed04d0beacea864ce805e0c4f86ba1cd1",
|
|
|
|
SubPath: "/test/unit/event.js",
|
|
|
|
QueryHash: "L2703",
|
2018-02-27 07:09:18 +00:00
|
|
|
},
|
|
|
|
"https://github.com/jquery/jquery/blob/a644101ed04d0beacea864ce805e0c4f86ba1cd1/test/unit/event.js": {
|
2024-05-04 01:48:16 +00:00
|
|
|
CommitID: "a644101ed04d0beacea864ce805e0c4f86ba1cd1",
|
|
|
|
SubPath: "/test/unit/event.js",
|
2018-02-27 07:09:18 +00:00
|
|
|
},
|
|
|
|
"https://github.com/jquery/jquery/commit/0705be475092aede1eddae01319ec931fb9c65fc": {
|
2024-05-04 01:48:16 +00:00
|
|
|
CommitID: "0705be475092aede1eddae01319ec931fb9c65fc",
|
2018-02-27 07:09:18 +00:00
|
|
|
},
|
|
|
|
"https://github.com/jquery/jquery/tree/0705be475092aede1eddae01319ec931fb9c65fc/src": {
|
2024-05-04 01:48:16 +00:00
|
|
|
CommitID: "0705be475092aede1eddae01319ec931fb9c65fc",
|
|
|
|
SubPath: "/src",
|
2018-02-27 07:09:18 +00:00
|
|
|
},
|
|
|
|
"https://try.gogs.io/gogs/gogs/commit/d8a994ef243349f321568f9e36d5c3f444b99cae#diff-2": {
|
2024-05-04 01:48:16 +00:00
|
|
|
CommitID: "d8a994ef243349f321568f9e36d5c3f444b99cae",
|
|
|
|
QueryHash: "diff-2",
|
|
|
|
},
|
|
|
|
"non-url": {},
|
|
|
|
"http://a/b/c/d/e/1234567812345678123456781234567812345678123456781234567812345678?a=b#L1-L2": {
|
|
|
|
CommitID: "1234567812345678123456781234567812345678123456781234567812345678",
|
|
|
|
QueryHash: "L1-L2",
|
|
|
|
},
|
|
|
|
"http://a/b/c/d/e/1234567812345678123456781234567812345678123456781234567812345678.": {
|
|
|
|
CommitID: "1234567812345678123456781234567812345678123456781234567812345678",
|
|
|
|
},
|
|
|
|
"http://a/b/c/d/e/1234567812345678123456781234567812345678123456781234567812345678/sub.": {
|
|
|
|
CommitID: "1234567812345678123456781234567812345678123456781234567812345678",
|
|
|
|
SubPath: "/sub",
|
|
|
|
},
|
|
|
|
"http://a/b/c/d/e/1234567812345678123456781234567812345678123456781234567812345678?a=b.": {
|
|
|
|
CommitID: "1234567812345678123456781234567812345678123456781234567812345678",
|
|
|
|
},
|
|
|
|
"http://a/b/c/d/e/1234567812345678123456781234567812345678123456781234567812345678?a=b&c=d": {
|
|
|
|
CommitID: "1234567812345678123456781234567812345678123456781234567812345678",
|
|
|
|
},
|
|
|
|
"http://a/b/c/d/e/1234567812345678123456781234567812345678123456781234567812345678#hash.": {
|
|
|
|
CommitID: "1234567812345678123456781234567812345678123456781234567812345678",
|
|
|
|
QueryHash: "hash",
|
2018-02-27 07:09:18 +00:00
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for k, v := range testCases {
|
2024-05-04 01:48:16 +00:00
|
|
|
ret, ok := anyHashPatternExtract(k)
|
|
|
|
if v.CommitID == "" {
|
|
|
|
assert.False(t, ok)
|
|
|
|
} else {
|
|
|
|
assert.EqualValues(t, strings.TrimSuffix(k, "."), ret.FullURL)
|
|
|
|
assert.EqualValues(t, v.CommitID, ret.CommitID)
|
|
|
|
assert.EqualValues(t, v.SubPath, ret.SubPath)
|
|
|
|
assert.EqualValues(t, v.QueryHash, ret.QueryHash)
|
|
|
|
}
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestRegExp_shortLinkPattern(t *testing.T) {
|
|
|
|
trueTestCases := []string{
|
|
|
|
"[[stuff]]",
|
|
|
|
"[[]]",
|
|
|
|
"[[stuff|title=Difficult name with spaces*!]]",
|
|
|
|
}
|
|
|
|
falseTestCases := []string{
|
|
|
|
"test",
|
|
|
|
"abcdefg",
|
|
|
|
"[[]",
|
|
|
|
"[[",
|
|
|
|
"[]",
|
|
|
|
"]]",
|
|
|
|
"abcdefghijklmnopqrstuvwxyz",
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, testCase := range trueTestCases {
|
2024-11-16 08:41:44 +00:00
|
|
|
assert.True(t, globalVars().shortLinkPattern.MatchString(testCase))
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
for _, testCase := range falseTestCases {
|
2024-11-16 08:41:44 +00:00
|
|
|
assert.False(t, globalVars().shortLinkPattern.MatchString(testCase))
|
2018-02-27 07:09:18 +00:00
|
|
|
}
|
|
|
|
}
|