Fix wrong test usage of `AppSubURL` (#29459)

The tests use an invalid `setting.AppSubURL`. The wrong behaviour
disturbs other PRs like #29222 and #29427.

diff --git a/modules/markup/markdown/markdown_test.go b/modules/markup/markdown/markdown_test.go
index bdf4011fa24861d7d95f7b5f83df07aaab0e7483..398efedb98317ccc3bb98f600c5ddcbf9350d96d 100644 (file)
--- a/modules/markup/markdown/markdown_test.go
+++ b/modules/markup/markdown/markdown_test.go
@@ -21,12 +21,11 @@ import (
 )
 
 const (
-       AppURL    = "http://localhost:3000/"
-       Repo      = "gogits/gogs"
-       AppSubURL = AppURL + Repo + "/"
+       AppURL  = "http://localhost:3000/"
+       FullURL = AppURL + "gogits/gogs/"
 )
 
-// these values should match the Repo const above
+// these values should match the const above
 var localMetas = map[string]string{
        "user":     "gogits",
        "repo":     "gogs",
@@ -48,13 +47,12 @@ func TestMain(m *testing.M) {
 
 func TestRender_StandardLinks(t *testing.T) {
        setting.AppURL = AppURL
-       setting.AppSubURL = AppSubURL
 
        test := func(input, expected, expectedWiki string) {
                buffer, err := markdown.RenderString(&markup.RenderContext{
                        Ctx: git.DefaultContext,
                        Links: markup.Links{
-                               Base: setting.AppSubURL,
+                               Base: FullURL,
                        },
                }, input)
                assert.NoError(t, err)
@@ -63,7 +61,7 @@ func TestRender_StandardLinks(t *testing.T) {
                buffer, err = markdown.RenderString(&markup.RenderContext{
                        Ctx: git.DefaultContext,
                        Links: markup.Links{
-                               Base: setting.AppSubURL,
+                               Base: FullURL,
                        },
                        IsWiki: true,
                }, input)
@@ -74,8 +72,8 @@ func TestRender_StandardLinks(t *testing.T) {
        googleRendered := `<p><a href="https://google.com/" rel="nofollow">https://google.com/</a></p>`
        test("<https://google.com/>", googleRendered, googleRendered)
 
-       lnk := util.URLJoin(AppSubURL, "WikiPage")
-       lnkWiki := util.URLJoin(AppSubURL, "wiki", "WikiPage")
+       lnk := util.URLJoin(FullURL, "WikiPage")
+       lnkWiki := util.URLJoin(FullURL, "wiki", "WikiPage")
        test("[WikiPage](WikiPage)",
                `<p><a href="`+lnk+`" rel="nofollow">WikiPage</a></p>`,
                `<p><a href="`+lnkWiki+`" rel="nofollow">WikiPage</a></p>`)
@@ -83,13 +81,12 @@ func TestRender_StandardLinks(t *testing.T) {
 
 func TestRender_Images(t *testing.T) {
        setting.AppURL = AppURL
-       setting.AppSubURL = AppSubURL
 
        test := func(input, expected string) {
                buffer, err := markdown.RenderString(&markup.RenderContext{
                        Ctx: git.DefaultContext,
                        Links: markup.Links{
-                               Base: setting.AppSubURL,
+                               Base: FullURL,
                        },
                }, input)
                assert.NoError(t, err)
@@ -99,7 +96,7 @@ func TestRender_Images(t *testing.T) {
        url := "../../.images/src/02/train.jpg"
        title := "Train"
        href := "https://gitea.io"
-       result := util.URLJoin(AppSubURL, url)
+       result := util.URLJoin(FullURL, url)
        // hint: With Markdown v2.5.2, there is a new syntax: [link](URL){:target="_blank"} , but we do not support it now
 
        test(
@@ -289,15 +286,14 @@ This PR has been generated by [Renovate Bot](https://github.com/renovatebot/reno
 
 func TestTotal_RenderWiki(t *testing.T) {
        setting.AppURL = AppURL
-       setting.AppSubURL = AppSubURL
 
-       answers := testAnswers(util.URLJoin(AppSubURL, "wiki"), util.URLJoin(AppSubURL, "wiki", "raw"))
+       answers := testAnswers(util.URLJoin(FullURL, "wiki"), util.URLJoin(FullURL, "wiki", "raw"))
 
        for i := 0; i < len(sameCases); i++ {
                line, err := markdown.RenderString(&markup.RenderContext{
                        Ctx: git.DefaultContext,
                        Links: markup.Links{
-                               Base: setting.AppSubURL,
+                               Base: FullURL,
                        },
                        Metas:  localMetas,
                        IsWiki: true,
@@ -310,12 +306,12 @@ func TestTotal_RenderWiki(t *testing.T) {
                // Guard wiki sidebar: special syntax
                `[[Guardfile-DSL / Configuring-Guard|Guardfile-DSL---Configuring-Guard]]`,
                // rendered
-               `<p><a href="` + AppSubURL + `wiki/Guardfile-DSL---Configuring-Guard" rel="nofollow">Guardfile-DSL / Configuring-Guard</a></p>
+               `<p><a href="` + FullURL + `wiki/Guardfile-DSL---Configuring-Guard" rel="nofollow">Guardfile-DSL / Configuring-Guard</a></p>
 `,
                // special syntax
                `[[Name|Link]]`,
                // rendered
-               `<p><a href="` + AppSubURL + `wiki/Link" rel="nofollow">Name</a></p>
+               `<p><a href="` + FullURL + `wiki/Link" rel="nofollow">Name</a></p>
 `,
        }
 
@@ -323,7 +319,7 @@ func TestTotal_RenderWiki(t *testing.T) {
                line, err := markdown.RenderString(&markup.RenderContext{
                        Ctx: git.DefaultContext,
                        Links: markup.Links{
-                               Base: setting.AppSubURL,
+                               Base: FullURL,
                        },
                        IsWiki: true,
                }, testCases[i])
@@ -334,15 +330,14 @@ func TestTotal_RenderWiki(t *testing.T) {
 
 func TestTotal_RenderString(t *testing.T) {
        setting.AppURL = AppURL
-       setting.AppSubURL = AppSubURL
 
-       answers := testAnswers(util.URLJoin(AppSubURL, "src", "master"), util.URLJoin(AppSubURL, "media", "master"))
+       answers := testAnswers(util.URLJoin(FullURL, "src", "master"), util.URLJoin(FullURL, "media", "master"))
 
        for i := 0; i < len(sameCases); i++ {
                line, err := markdown.RenderString(&markup.RenderContext{
                        Ctx: git.DefaultContext,
                        Links: markup.Links{
-                               Base:       AppSubURL,
+                               Base:       FullURL,
                                BranchPath: "master",
                        },
                        Metas: localMetas,
@@ -357,7 +352,7 @@ func TestTotal_RenderString(t *testing.T) {
                line, err := markdown.RenderString(&markup.RenderContext{
                        Ctx: git.DefaultContext,
                        Links: markup.Links{
-                               Base: AppSubURL,
+                               Base: FullURL,
                        },
                }, testCases[i])
                assert.NoError(t, err)

diff --git a/routers/api/v1/misc/markup_test.go b/routers/api/v1/misc/markup_test.go
index f499501c2fc9e135a9257a75844dc7a91b0386b4..5236fd06ae2343b458cb9728a964cca12dd0bbb0 100644 (file)
--- a/routers/api/v1/misc/markup_test.go
+++ b/routers/api/v1/misc/markup_test.go
@@ -20,9 +20,9 @@ import (
 )
 
 const (
-       AppURL    = "http://localhost:3000/"
-       Repo      = "gogits/gogs"
-       AppSubURL = AppURL + Repo + "/"
+       AppURL  = "http://localhost:3000/"
+       Repo    = "gogits/gogs"
+       FullURL = AppURL + Repo + "/"
 )
 
 func testRenderMarkup(t *testing.T, mode, filePath, text, responseBody string, responseCode int) {
@@ -74,20 +74,20 @@ func TestAPI_RenderGFM(t *testing.T) {
                // rendered
                `<p>Wiki! Enjoy :)</p>
 <ul>
-<li><a href="` + AppSubURL + `wiki/Links" rel="nofollow">Links, Language bindings, Engine bindings</a></li>
-<li><a href="` + AppSubURL + `wiki/Tips" rel="nofollow">Tips</a></li>
+<li><a href="` + FullURL + `wiki/Links" rel="nofollow">Links, Language bindings, Engine bindings</a></li>
+<li><a href="` + FullURL + `wiki/Tips" rel="nofollow">Tips</a></li>
 <li>Bezier widget (by <a href="` + AppURL + `r-lyeh" rel="nofollow">@r-lyeh</a>) <a href="https://github.com/ocornut/imgui/issues/786" rel="nofollow">https://github.com/ocornut/imgui/issues/786</a></li>
 </ul>
 `,
                // Guard wiki sidebar: special syntax
                `[[Guardfile-DSL / Configuring-Guard|Guardfile-DSL---Configuring-Guard]]`,
                // rendered
-               `<p><a href="` + AppSubURL + `wiki/Guardfile-DSL---Configuring-Guard" rel="nofollow">Guardfile-DSL / Configuring-Guard</a></p>
+               `<p><a href="` + FullURL + `wiki/Guardfile-DSL---Configuring-Guard" rel="nofollow">Guardfile-DSL / Configuring-Guard</a></p>
 `,
                // special syntax
                `[[Name|Link]]`,
                // rendered
-               `<p><a href="` + AppSubURL + `wiki/Link" rel="nofollow">Name</a></p>
+               `<p><a href="` + FullURL + `wiki/Link" rel="nofollow">Name</a></p>
 `,
                // empty
                ``,
@@ -111,8 +111,8 @@ Here are some links to the most important topics. You can find the full list of
 <p><strong>Wine Staging</strong> on website <a href="http://wine-staging.com" rel="nofollow">wine-staging.com</a>.</p>
 <h2 id="user-content-quick-links">Quick Links</h2>
 <p>Here are some links to the most important topics. You can find the full list of pages at the sidebar.</p>
-<p><a href="` + AppSubURL + `wiki/Configuration" rel="nofollow">Configuration</a>
-<a href="` + AppSubURL + `wiki/raw/images/icon-bug.png" rel="nofollow"><img src="` + AppSubURL + `wiki/raw/images/icon-bug.png" title="icon-bug.png" alt="images/icon-bug.png"/></a></p>
+<p><a href="` + FullURL + `wiki/Configuration" rel="nofollow">Configuration</a>
+<a href="` + FullURL + `wiki/raw/images/icon-bug.png" rel="nofollow"><img src="` + FullURL + `wiki/raw/images/icon-bug.png" title="icon-bug.png" alt="images/icon-bug.png"/></a></p>
 `,
        }