fix RefURL

Author: wxiaoguang

modules/git/commit_submodule_file.go

@@ -31,11 +31,15 @@ func NewCommitSubModuleFile(refURL, refID string) *CommitSubModuleFile {
 	}
 }
 
-func getRefURL(refURL, urlPrefix, repoFullName, sshDomain string) string {
+func getRefURL(refURL, repoFullName string) string {
 	if refURL == "" {
 		return ""
 	}
 
+	// FIXME: use a more generic way to handle the domain and subpath
+	urlPrefix := setting.AppURL
+	sshDomain := setting.SSH.Domain
+
 	refURI := strings.TrimSuffix(refURL, ".git")
 
 	prefixURL, _ := url.Parse(urlPrefix)
@@ -102,9 +106,8 @@ func getRefURL(refURL, urlPrefix, repoFullName, sshDomain string) string {
 }
 
 // RefURL guesses and returns reference URL.
-// FIXME: template passes AppURL as urlPrefix, it needs to figure out the correct approach (no hard-coded AppURL anymore)
 func (sf *CommitSubModuleFile) RefURL(repoFullName string) string {
-	return getRefURL(sf.refURL, setting.AppURL, repoFullName, setting.SSH.Domain)
+	return getRefURL(sf.refURL, repoFullName)
 }
 
 // RefID returns reference ID.

modules/git/commit_submodule_file_test.go

@@ -6,6 +6,9 @@ package git
 import (
 	"testing"
 
+	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/test"
+
 	"github.com/stretchr/testify/assert"
 )
 
@@ -37,6 +40,10 @@ func TestCommitSubModuleFileGetRefURL(t *testing.T) {
 	}
 
 	for _, kase := range kases {
-		assert.EqualValues(t, kase.expect, getRefURL(kase.refURL, kase.prefixURL, kase.parentPath, kase.SSHDomain))
+		t.Run(kase.refURL, func(t *testing.T) {
+			defer test.MockVariableValue(&setting.AppURL, kase.prefixURL)()
+			defer test.MockVariableValue(&setting.SSH.Domain, kase.SSHDomain)()
+			assert.EqualValues(t, kase.expect, getRefURL(kase.refURL, kase.parentPath))
+		})
 	}
 }