Skip to content

Commit 2b3d373

Browse files
committed
Fixing incorrect tests, when develop is branched from master it is still a tagged commit. The version should not change
1 parent 558aeb6 commit 2b3d373

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

GitVersionCore.Tests/IntegrationTests/GitFlow/DevelopScenarios.cs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,26 @@
55
[TestFixture]
66
public class DevelopScenarios
77
{
8+
[Test]
9+
public void WhenDevelopBranchedFromTaggedCommitOnMasterVersionDoesNotChange()
10+
{
11+
using (var fixture = new EmptyRepositoryFixture(new Config()))
12+
{
13+
fixture.Repository.MakeATaggedCommit("1.0.0");
14+
fixture.Repository.CreateBranch("develop").Checkout();
15+
fixture.AssertFullSemver("1.0.0+0");
16+
}
17+
}
18+
819
[Test]
920
public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
1021
{
1122
using (var fixture = new EmptyRepositoryFixture(new Config()))
1223
{
1324
fixture.Repository.MakeATaggedCommit("1.0.0");
1425
fixture.Repository.CreateBranch("develop").Checkout();
15-
fixture.AssertFullSemver("1.1.0-unstable.0+0");
26+
fixture.Repository.MakeACommit();
27+
fixture.AssertFullSemver("1.1.0-unstable.1+1");
1628
}
1729
}
1830

@@ -23,6 +35,7 @@ public void MergingReleaseBranchBackIntoDevelopWithoutMergingToMaster_DoesNotBum
2335
{
2436
fixture.Repository.MakeATaggedCommit("1.0.0");
2537
fixture.Repository.CreateBranch("develop").Checkout();
38+
fixture.Repository.MakeACommit();
2639
fixture.Repository.CreateBranch("release-2.0.0").Checkout();
2740
fixture.AssertFullSemver("2.0.0-beta.1+0");
2841
fixture.Repository.Checkout("develop");

0 commit comments

Comments
 (0)