diff options
author | Cosmin Stroe <cstroe@users.sf.net> | 2016-04-22 17:28:08 -0500 |
---|---|---|
committer | Unknwon <u@gogs.io> | 2016-04-22 18:28:08 -0400 |
commit | ba314a7a36eafc6412544515ebcde58479400e41 (patch) | |
tree | 0bbc22db898a9b5e17074ac583ffabf1cdf6d091 /models | |
parent | 39356f423843bcd747bb21526d09bfe6114dde58 (diff) | |
download | gitea-ba314a7a36eafc6412544515ebcde58479400e41.tar.gz gitea-ba314a7a36eafc6412544515ebcde58479400e41.zip |
Support alphanumeric issue style (ABC-1234) for external issue tracker (#2992)
Diffstat (limited to 'models')
-rw-r--r-- | models/repo.go | 8 | ||||
-rw-r--r-- | models/repo_test.go | 62 |
2 files changed, 70 insertions, 0 deletions
diff --git a/models/repo.go b/models/repo.go index 91dd9acf3e..8820293e5b 100644 --- a/models/repo.go +++ b/models/repo.go @@ -170,6 +170,7 @@ type Repository struct { EnableIssues bool `xorm:"NOT NULL DEFAULT true"` EnableExternalTracker bool ExternalTrackerFormat string + ExternalTrackerStyle string ExternalMetas map[string]string `xorm:"-"` EnablePulls bool `xorm:"NOT NULL DEFAULT true"` @@ -254,6 +255,13 @@ func (repo *Repository) ComposeMetas() map[string]string { "user": repo.MustOwner().Name, "repo": repo.Name, } + switch repo.ExternalTrackerStyle { + case markdown.ISSUE_NAME_STYLE_ALPHANUMERIC: + repo.ExternalMetas["style"] = markdown.ISSUE_NAME_STYLE_ALPHANUMERIC + default: + repo.ExternalMetas["style"] = markdown.ISSUE_NAME_STYLE_NUMERIC + } + } return repo.ExternalMetas } diff --git a/models/repo_test.go b/models/repo_test.go new file mode 100644 index 0000000000..4a4203ba02 --- /dev/null +++ b/models/repo_test.go @@ -0,0 +1,62 @@ +package models_test + +import ( + "testing" + . "github.com/smartystreets/goconvey/convey" + . "github.com/gogits/gogs/models" + + "github.com/gogits/gogs/modules/markdown" +) + +func TestRepo(t *testing.T) { + Convey("The metas map", t, func () { + var repo = new(Repository) + repo.Name = "testrepo" + repo.Owner = new(User) + repo.Owner.Name = "testuser" + repo.ExternalTrackerFormat = "https://someurl.com/{user}/{repo}/{issue}" + + Convey("When no external tracker is configured", func () { + Convey("It should be nil", func () { + repo.EnableExternalTracker = false + So(repo.ComposeMetas(), ShouldEqual, map[string]string(nil)) + }) + Convey("It should be nil even if other settings are present", func () { + repo.EnableExternalTracker = false + repo.ExternalTrackerFormat = "http://someurl.com/{user}/{repo}/{issue}" + repo.ExternalTrackerStyle = markdown.ISSUE_NAME_STYLE_NUMERIC + So(repo.ComposeMetas(), ShouldEqual, map[string]string(nil)) + }) + }) + + Convey("When an external issue tracker is configured", func () { + repo.EnableExternalTracker = true + Convey("It should default to numeric issue style", func () { + metas := repo.ComposeMetas() + So(metas["style"], ShouldEqual, markdown.ISSUE_NAME_STYLE_NUMERIC) + }) + Convey("It should pass through numeric issue style setting", func () { + repo.ExternalTrackerStyle = markdown.ISSUE_NAME_STYLE_NUMERIC + metas := repo.ComposeMetas() + So(metas["style"], ShouldEqual, markdown.ISSUE_NAME_STYLE_NUMERIC) + }) + Convey("It should pass through alphanumeric issue style setting", func () { + repo.ExternalTrackerStyle = markdown.ISSUE_NAME_STYLE_ALPHANUMERIC + metas := repo.ComposeMetas() + So(metas["style"], ShouldEqual, markdown.ISSUE_NAME_STYLE_ALPHANUMERIC) + }) + Convey("It should contain the user name", func () { + metas := repo.ComposeMetas() + So(metas["user"], ShouldEqual, "testuser") + }) + Convey("It should contain the repo name", func () { + metas := repo.ComposeMetas() + So(metas["repo"], ShouldEqual, "testrepo") + }) + Convey("It should contain the URL format", func () { + metas := repo.ComposeMetas() + So(metas["format"], ShouldEqual, "https://someurl.com/{user}/{repo}/{issue}") + }) + }) + }) +} |