Skip to content

Commit 3ade5b3

Browse files
committed
Add additional unit test
1 parent fa54904 commit 3ade5b3

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,21 @@ public void DoesNotTakeVersionFromNameOfNonReleaseBranch()
2626
fixture.AssertFullSemver("1.1.0-alpha.5");
2727
}
2828

29+
[TestCase("release")]
30+
[TestCase("hotfix")]
31+
public void DoesNotTakeVersionFromNameWhenItHasBeenAccidentalSpecifiedInBranch(string branch)
32+
{
33+
using var fixture = new EmptyRepositoryFixture("main");
34+
35+
fixture.MakeATaggedCommit("1.0.0");
36+
fixture.BranchTo($"{branch}/downgrade-some-lib-to-3.2.1");
37+
fixture.MakeACommit();
38+
fixture.Checkout("main");
39+
fixture.MergeNoFF($"{branch}/downgrade-some-lib-to-3.2.1");
40+
41+
fixture.AssertFullSemver("1.0.1+2");
42+
}
43+
2944
[Test]
3045
public void TakesVersionFromNameOfBranchThatIsReleaseByConfig()
3146
{

0 commit comments

Comments
 (0)