Merge branch 'master' into softwarehelden/tfs-merge-messages

GitTools · joergmetzler · Feb 23, 2018 · Mar 9, 2018 · Mar 10, 2018 · Mar 28, 2018
commit da3620afb7e1f46372e703f889bc83a107ecf290
diff --git a/...itVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs b/...itVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs
@@ -48,7 +48,8 @@ public void ShouldNotAllowIncrementOfVersion()
         [TestCase("Merge remote-tracking branch 'origin/release/0.8.0' into develop/master", true, "0.8.0")]
         [TestCase("Merge release/5.1.0 to master", true, "5.1.0")] // Team Foundation Server 2017 default merge message (en-US)
         [TestCase("Zusammengeführter PR \"9\": release/5.1.0 mit master mergen", true, "5.1.0")] // Team Foundation Server 2017 default merge message (de-DE)
-        public void AssertMergeMessage(string message, bool isMergeCommit, string expectedVersion)
+        [TestCase("Merge remote-tracking branch 'refs/remotes/origin/release/2.0.0'", true, "2.0.0")]
+        public void TakesVersionFromMergeOfReleaseBranch(string message, bool isMergeCommit, string expectedVersion)
         {
             var parents = GetParents(isMergeCommit);
             AssertMergeMessage(message, expectedVersion, parents);