Update NextVersionCalculatorTests.cs

Test merging int master with next-version
GitTools · Jul 13, 2020 · 8f0571e · 8f0571e
1 parent 6cb755b
commit 8f0571e
Showing 1 changed file with 30 additions and 0 deletions.
diff --git a/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs b/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs
@@ -147,6 +147,36 @@ public void PreReleaseTagCanUseBranchNameMainline()
             fixture.AssertFullSemver("1.0.0-foo.2", config);
         }
 
+        [Test]
+        public void MergeIntoMainline()
+        {
+            var config = new Config
+            {
+                VersioningMode = VersioningMode.Mainline,
+                NextVersion = "1.0.0",
+                Branches = new Dictionary<string, BranchConfig>
+                {
+                    {
+                        "custom", new BranchConfig
+                        {
+                            Regex = "custom/",
+                            Tag = "useBranchName",
+                            SourceBranches = new HashSet<string>()
+                        }
+                    }
+                }
+            };
+
+            using var fixture = new EmptyRepositoryFixture();
+            fixture.MakeACommit();
+            fixture.BranchTo("foo");
+            fixture.MakeACommit();
+            fixture.Checkout("master");
+            fixture.Merge("foo");
+
+            fixture.AssertFullSemver("1.0.0", config);
+        }
+
         [Test]
         public void PreReleaseTagCanUseBranchNameVariable()
         {