diff options
| author | John Olheiser <42128690+jolheiser@users.noreply.github.com> | 2020-01-19 22:39:21 -0600 |
|---|---|---|
| committer | techknowlogick <techknowlogick@gitea.io> | 2020-01-19 23:39:21 -0500 |
| commit | 7d7ab1eeae43d99fe329878ac9c8db5e45e2dee5 (patch) | |
| tree | af20001905b81ab8313fbd8a50114ca71764f7da /modules/markup/html_internal_test.go | |
| parent | c5014a7f2c4a263818269216d16d6f21b008cd17 (diff) | |
| download | gitea-7d7ab1eeae43d99fe329878ac9c8db5e45e2dee5.tar.gz gitea-7d7ab1eeae43d99fe329878ac9c8db5e45e2dee5.zip | |
Issue/PR Context Popups (#9822)
* Add data-index attribute to issue anchors
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Init JS
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Add required data to anchor
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Finish popup
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Revert changes to html.go
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Better octicon contexts
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Split out popup function for re-use
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Style changes, test fixes, and cross-reference support
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Prefer em to px
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Move label margin to base CSS
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Move JS to separate file.
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Move JS to features and fix module
Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Remove query-string and hash
Co-Authored-By: silverwind <me@silverwind.io>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
Diffstat (limited to 'modules/markup/html_internal_test.go')
| -rw-r--r-- | modules/markup/html_internal_test.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/markup/html_internal_test.go b/modules/markup/html_internal_test.go index 2746dec2cf..7e4bb6f22f 100644 --- a/modules/markup/html_internal_test.go +++ b/modules/markup/html_internal_test.go @@ -106,13 +106,13 @@ func TestRender_IssueIndexPattern2(t *testing.T) { links := make([]interface{}, len(indices)) for i, index := range indices { - links[i] = numericIssueLink(util.URLJoin(setting.AppSubURL, path), "issue", index, marker) + links[i] = numericIssueLink(util.URLJoin(setting.AppSubURL, path), "ref-issue", index, marker) } expectedNil := fmt.Sprintf(expectedFmt, links...) testRenderIssueIndexPattern(t, s, expectedNil, &postProcessCtx{metas: localMetas}) for i, index := range indices { - links[i] = numericIssueLink(prefix, "issue", index, marker) + links[i] = numericIssueLink(prefix, "ref-issue", index, marker) } expectedNum := fmt.Sprintf(expectedFmt, links...) testRenderIssueIndexPattern(t, s, expectedNum, &postProcessCtx{metas: numericMetas}) @@ -178,7 +178,7 @@ func TestRender_IssueIndexPattern4(t *testing.T) { test := func(s, expectedFmt string, names ...string) { links := make([]interface{}, len(names)) for i, name := range names { - links[i] = alphanumIssueLink("https://someurl.com/someUser/someRepo/", "issue", name) + links[i] = alphanumIssueLink("https://someurl.com/someUser/someRepo/", "ref-issue", name) } expected := fmt.Sprintf(expectedFmt, links...) testRenderIssueIndexPattern(t, s, expected, &postProcessCtx{metas: alphanumericMetas}) @@ -217,7 +217,7 @@ func TestRender_AutoLink(t *testing.T) { // render valid issue URLs test(util.URLJoin(setting.AppSubURL, "issues", "3333"), - numericIssueLink(util.URLJoin(setting.AppSubURL, "issues"), "issue", 3333, "#")) + numericIssueLink(util.URLJoin(setting.AppSubURL, "issues"), "ref-issue", 3333, "#")) // render valid commit URLs tmp := util.URLJoin(AppSubURL, "commit", "d8a994ef243349f321568f9e36d5c3f444b99cae") @@ -248,11 +248,11 @@ func TestRender_FullIssueURLs(t *testing.T) { 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", - `Look here <a href="http://localhost:3000/person/repo/issues/4" class="issue">person/repo#4</a>`) + `Look here <a href="http://localhost:3000/person/repo/issues/4" class="ref-issue">person/repo#4</a>`) test("http://localhost:3000/person/repo/issues/4#issuecomment-1234", - `<a href="http://localhost:3000/person/repo/issues/4#issuecomment-1234" class="issue">person/repo#4</a>`) + `<a href="http://localhost:3000/person/repo/issues/4#issuecomment-1234" class="ref-issue">person/repo#4</a>`) test("http://localhost:3000/gogits/gogs/issues/4", - `<a href="http://localhost:3000/gogits/gogs/issues/4" class="issue">#4</a>`) + `<a href="http://localhost:3000/gogits/gogs/issues/4" class="ref-issue">#4</a>`) } func TestRegExp_sha1CurrentPattern(t *testing.T) { |