Always use the standard port for browser URLs (#2730)

features/propose/features/self_hosted.feature

@@ -26,5 +26,5 @@ Feature: self-hosted service
     When I run "git-town propose"
     Then "open" launches a new proposal with this url in my browser:
       """
-      https://git.example.com:4022/a/b
+      https://git.example.com/a/b
       """

features/repo/features/self_hosted.feature

@@ -25,5 +25,5 @@ Feature: self hosted servie
     When I run "git-town repo"
     Then "open" launches a new proposal with this url in my browser:
       """
-      https://git.example.com:4022/a/b
+      https://git.example.com/a/b
       """

src/hosting/bitbucket/connector.go

@@ -64,7 +64,7 @@ func (self *Connector) NewProposalURL(branch, parentBranch domain.LocalBranchNam
 }
 
 func (self *Connector) RepositoryURL() string {
-	return fmt.Sprintf("https://%s/%s/%s", self.Hostname, self.Organization, self.Repository)
+	return fmt.Sprintf("https://%s/%s/%s", self.HostnameWithStandardPort(), self.Organization, self.Repository)
 }
 
 func (self *Connector) SquashMergeProposal(_ int, _ string) (mergeSHA domain.SHA, err error) {

src/hosting/common/config.go

@@ -1,5 +1,7 @@
 package common
 
+import "strings"
+
 // Config contains data needed by all platform connectors.
 type Config struct {
 	// bearer token to authenticate with the API
@@ -14,3 +16,11 @@ type Config struct {
 	// repo name within the organization
 	Repository string
 }
+
+func (self Config) HostnameWithStandardPort() string {
+	index := strings.IndexRune(self.Hostname, ':')
+	if index == -1 {
+		return self.Hostname
+	}
+	return self.Hostname[:index]
+}

src/hosting/common/config_test.go

@@ -0,0 +1,38 @@
+package common_test
+
+import (
+	"testing"
+
+	"github.com/git-town/git-town/v10/src/hosting/common"
+	"github.com/shoenig/test/must"
+)
+
+func TestHostnameWithStandardPort(t *testing.T) {
+	t.Parallel()
+
+	t.Run("no port in hostname", func(t *testing.T) {
+		t.Parallel()
+		config := common.Config{
+			APIToken:     "123456",
+			Hostname:     "git.example.com",
+			Organization: "org",
+			Repository:   "repo",
+		}
+		have := config.HostnameWithStandardPort()
+		want := "git.example.com"
+		must.EqOp(t, want, have)
+	})
+
+	t.Run("port in hostname", func(t *testing.T) {
+		t.Parallel()
+		config := common.Config{
+			APIToken:     "123456",
+			Hostname:     "git.example.com:4022",
+			Organization: "org",
+			Repository:   "repo",
+		}
+		have := config.HostnameWithStandardPort()
+		want := "git.example.com"
+		must.EqOp(t, want, have)
+	})
+}

src/hosting/gitea/connector.go

@@ -60,7 +60,7 @@ func (self *Connector) NewProposalURL(branch, parentBranch domain.LocalBranchNam
 }
 
 func (self *Connector) RepositoryURL() string {
-	return fmt.Sprintf("https://%s/%s/%s", self.Hostname, self.Organization, self.Repository)
+	return fmt.Sprintf("https://%s/%s/%s", self.HostnameWithStandardPort(), self.Organization, self.Repository)
 }
 
 func (self *Connector) SquashMergeProposal(number int, message string) (mergeSHA domain.SHA, err error) {

src/hosting/github/connector.go

@@ -60,7 +60,7 @@ func (self *Connector) NewProposalURL(branch, parentBranch domain.LocalBranchNam
 }
 
 func (self *Connector) RepositoryURL() string {
-	return fmt.Sprintf("https://%s/%s/%s", self.Hostname, self.Organization, self.Repository)
+	return fmt.Sprintf("https://%s/%s/%s", self.HostnameWithStandardPort(), self.Organization, self.Repository)
 }
 
 func (self *Connector) SquashMergeProposal(number int, message string) (mergeSHA domain.SHA, err error) {

src/hosting/gitlab/config.go

@@ -32,7 +32,7 @@ func (self *Config) RepositoryURL() string {
 }
 
 func (self *Config) baseURL() string {
-	return fmt.Sprintf("https://%s", self.Hostname)
+	return fmt.Sprintf("https://%s", self.HostnameWithStandardPort())
 }
 
 func (self *Config) projectPath() string {