Skip to content

Commit f271821

Browse files
committed
new merge message regex test
1 parent ab638a1 commit f271821

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/GitVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ public void ShouldNotAllowIncrementOfVersion()
5454
[TestCase("Merge pull request #95 in Particular/issue-94", true, null)]
5555
[TestCase("Merge pull request #95 in Particular/issue-94", false, null)]
5656
[TestCase("Merge pull request #64 from arledesma/feature-VS2013_3rd_party_test_framework_support", true, null)]
57+
[TestCase("Merge pull request #500 in FOO/bar from Particular/release-1.0.0 to develop)", true, "1.0.0")]
58+
[TestCase("Merge pull request #500 in FOO/bar from feature/new-service to develop)", true, null)]
5759
[TestCase("Finish Release-0.12.0", true, "0.12.0")] //Support Syntevo SmartGit/Hg's Gitflow merge commit messages for finishing a 'Release' branch
5860
[TestCase("Finish 0.14.1", true, "0.14.1")] //Support Syntevo SmartGit/Hg's Gitflow merge commit messages for finishing a 'Hotfix' branch
5961
[TestCase("Merge branch 'Release-v0.2.0'", true, "0.2.0")]

0 commit comments

Comments
 (0)