Updated support for release branch tag name configuration

Author: JakeGinnivan

GitVersionCore.Tests/GitFlow/ReleaseBranchTests.cs

@@ -0,0 +1,86 @@
+using GitVersion.Configuration;
+using LibGit2Sharp;
+using NUnit.Framework;
+
+[TestFixture]
+public class GitFlowReleaseBranchTests
+{
+    [Test]
+    public void CanTakeVersionFromReleaseBranch()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.3");
+            fixture.Repository.CreateBranch("develop");
+            fixture.Repository.MakeCommits(5);
+            fixture.Repository.CreateBranch("release-2.0.0");
+            fixture.Repository.Checkout("release-2.0.0");
+
+            fixture.AssertFullSemver("2.0.0-beta.1+5");
+        }
+    }
+
+    [Test]
+    public void CanTakeVersionFromReleaseBranchWithTagOverriden()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config { ReleaseBranchTag = "rc" }))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.3");
+            fixture.Repository.CreateBranch("develop");
+            fixture.Repository.MakeCommits(5);
+            fixture.Repository.CreateBranch("release-2.0.0");
+            fixture.Repository.Checkout("release-2.0.0");
+
+            fixture.AssertFullSemver("2.0.0-rc.1+5");
+        }
+    }
+
+    [Test]
+    public void WhenReleaseBranchIsMergedIntoMasterVersionIsTakenWithIt()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.3");
+            fixture.Repository.CreateBranch("develop");
+            fixture.Repository.MakeCommits(1);
+            fixture.Repository.CreateBranch("release-2.0.0");
+            fixture.Repository.Checkout("release-2.0.0");
+            fixture.Repository.MakeCommits(4);
+            fixture.Repository.Checkout("master");
+            fixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow());
+
+            // TODO For GitHubFlow this is 2.0.0+6, why is it different
+            fixture.AssertFullSemver("2.0.0");
+        }
+    }
+
+    // TODO This test fails for GitFlow, it needs to be fixed (although in reality a support branch should be used)
+    [Test, Ignore]
+    public void WhenReleaseBranchIsMergedIntoMasterHighestVersionIsTakenWithIt()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.3");
+            fixture.Repository.CreateBranch("develop");
+            fixture.Repository.MakeCommits(1);
+
+            fixture.Repository.CreateBranch("release-2.0.0");
+            fixture.Repository.Checkout("release-2.0.0");
+            fixture.Repository.MakeCommits(4);
+            fixture.Repository.Checkout("master");
+            fixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow());
+            fixture.Repository.Checkout("develop");
+            fixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow());
+
+            fixture.Repository.CreateBranch("release-1.0.0");
+            fixture.Repository.Checkout("release-1.0.0");
+            fixture.Repository.MakeCommits(4);
+            fixture.Repository.Checkout("master");
+            fixture.Repository.MergeNoFF("release-1.0.0", Constants.SignatureNow());
+            fixture.Repository.Checkout("develop");
+            fixture.Repository.MergeNoFF("release-1.0.0", Constants.SignatureNow());
+
+            fixture.AssertFullSemver("2.0.0+11");
+        }
+    }
+}

GitVersionCore.Tests/GitHubFlow/ReleaseBranchTests.cs

@@ -19,6 +19,20 @@ public void CanTakeVersionFromReleaseBranch()
         }
     }
 
+    [Test]
+    public void CanTakeVersionFromReleaseBranchWithTagOverriden()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config { ReleaseBranchTag = "rc" }))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.3");
+            fixture.Repository.MakeCommits(5);
+            fixture.Repository.CreateBranch("release-2.0.0");
+            fixture.Repository.Checkout("release-2.0.0");
+
+            fixture.AssertFullSemver("2.0.0-rc.1+5");
+        }
+    }
+
     [Test]
     public void WhenReleaseBranchIsMergedIntoMasterVersionIsTakenWithIt()
     {

GitVersionCore/GitFlow/BranchFinders/ReleaseVersionFinder.cs

@@ -11,7 +11,7 @@ public SemanticVersion FindVersion(GitVersionContext context)
             var shortVersion = ShortVersionParser.Parse(versionString);
 
             EnsureVersionIsValid(shortVersion, context.CurrentBranch);
-            var semanticVersionPreReleaseTag = "beta.1";
+            var semanticVersionPreReleaseTag = context.Configuration.ReleaseBranchTag + ".1";
 
             var nbHotfixCommits = BranchCommitDifferenceFinder.NumberOfCommitsInBranchNotKnownFromBaseBranch(context.Repository, context.CurrentBranch, BranchType.Release, "develop");
 

GitVersionCore/GitHubFlow/OtherBranchVersionFinder.cs

@@ -27,7 +27,7 @@ public bool FindVersion(GitVersionContext context, out SemanticVersion semanticV
 
             if (semanticVersionPreReleaseTag.Name == "release")
             {
-                semanticVersionPreReleaseTag.Name = "beta";
+                semanticVersionPreReleaseTag.Name = context.Configuration.ReleaseBranchTag;
             }
 
             semanticVersion = new SemanticVersion