Demonstration of bugs for issues 1525 & 1526

Demonstration of bugs for issues GH-1525 and GH-1526.

Author: Dominique St-Amand

src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs

@@ -398,4 +398,41 @@ public void WhenPreventIncrementOfMergedBranchVersionIsSetToFalseForDevelopCommi
         fixture.Repository.Branches.Remove(HotfixBranch);
         fixture.AssertFullSemver("1.2.0-alpha.19", config);
     }
+
+    [Test]
+    public void CommitsSinceVersionSourceGoesDownWhenDeletingAReleaseBranch()
+    {
+        var config = new Config
+        {
+            VersioningMode = VersioningMode.ContinuousDeployment
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit();
+        fixture.ApplyTag("1.1.0");
+        fixture.BranchTo("develop");
+        fixture.MakeACommit("commit in develop");
+        fixture.BranchTo("feature/featureA");
+        fixture.MakeACommit("commit in featureA");
+        fixture.MakeACommit("commit in featureA");
+        fixture.Checkout("develop");
+        fixture.MakeACommit("commit in develop");
+        fixture.MakeACommit("commit in develop");
+        fixture.BranchTo("release/1.2.0");
+        fixture.MakeACommit("commit in release/1.2.0");
+        fixture.Checkout("feature/featureA");
+        fixture.MergeNoFF("develop");
+        fixture.Checkout("develop");
+        fixture.MergeNoFF("feature/featureA");
+        fixture.Checkout("master");
+        fixture.MergeNoFF("release/1.2.0");
+        fixture.ApplyTag("1.2.0");
+        fixture.Checkout("develop");
+        fixture.MergeNoFF("release/1.2.0");
+        fixture.SequenceDiagram.Destroy("release/1.2.0");
+        fixture.Repository.Branches.Remove("release/1.2.0");
+
+        var expectedFullSemVer = "1.3.0-alpha.6";
+        fixture.AssertFullSemver(expectedFullSemVer, config);
+    }
 }

src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs

@@ -558,4 +558,30 @@ public void ShouldHaveAGreaterSemVerAfterDevelopIsMergedIntoFeature()
         fixture.MergeNoFF("develop");
         fixture.AssertFullSemver("16.24.0-feat-featX.4", config);
     }
+
+    [Test]
+    public void MergingFromDevelopToFeatureShouldNotCauseMinorPatchToChange()
+    {
+        var config = new Config
+        {
+            VersioningMode = VersioningMode.ContinuousDeployment
+        };
+
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.MakeACommit();
+        fixture.ApplyTag("1.1.0");
+        fixture.BranchTo("develop");
+        fixture.MakeACommit("commit in develop");
+        fixture.BranchTo("feature/featureA");
+        fixture.MakeACommit("commit in featureA");
+        fixture.MakeACommit("commit in featureA");
+        fixture.Checkout("develop");
+        fixture.MakeACommit("commit in develop");
+        fixture.MakeACommit("commit in develop");
+        fixture.Checkout("feature/featureA");
+        fixture.MergeNoFF("develop");
+
+        var expectedFullSemVer = "1.2.0-featureA.5";
+        fixture.AssertFullSemver(expectedFullSemVer, config);
+    }
 }