Skip to content

Commit 5138209

Browse files
committed
2268 Add a version calculation test for non-master mainline branches
1 parent 5e9c79c commit 5138209

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

src/GitVersionCore.Tests/IntegrationTests/MainlineDevelopmentMode.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,24 @@ public class MainlineDevelopmentMode : TestBase
2020
VersioningMode = VersioningMode.Mainline
2121
};
2222

23+
[Test]
24+
public void VerifyNonMasterMainlineVersionIdenticalAsMaster()
25+
{
26+
using var fixture = new EmptyRepositoryFixture();
27+
fixture.Repository.MakeACommit("1");
28+
29+
fixture.BranchTo("feature/foo", "foo");
30+
fixture.MakeACommit("2 +semver: major");
31+
fixture.Checkout("master");
32+
fixture.MergeNoFF("feature/foo");
33+
34+
fixture.AssertFullSemver("1.0.0", config);
35+
36+
fixture.BranchTo("support/1.0", "support");
37+
38+
fixture.AssertFullSemver("1.0.0", config);
39+
}
40+
2341
[Test]
2442
public void MergedFeatureBranchesToMasterImpliesRelease()
2543
{

0 commit comments

Comments
 (0)