From 64b40bb936f3ba4403123d55bae4f8a24aabf966 Mon Sep 17 00:00:00 2001 From: Francisco Taborda Date: Thu, 31 Mar 2016 10:55:00 +0100 Subject: [PATCH 1/2] Test which shows the commit count reset to 0 when merging into the release branch in continuous deployment mode --- .../ReleaseBranchScenarios.cs | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs index 3a5ebff400..ffdacb870b 100644 --- a/src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs +++ b/src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs @@ -326,4 +326,35 @@ public void HotfixOffReleaseBranchShouldNotResetCount() fixture.AssertFullSemver("2.0.0-beta.7"); } } + + [Test] + public void MergeOnReleaseBranchShouldNotResetCount() + { + using (var fixture = new EmptyRepositoryFixture(new Config + { + AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag, + VersioningMode = VersioningMode.ContinuousDeployment, + })) + { + const string TaggedVersion = "1.0.3"; + fixture.Repository.MakeATaggedCommit(TaggedVersion); + fixture.Repository.CreateBranch("develop"); + fixture.Repository.Checkout("develop"); + fixture.Repository.MakeACommit(); + + fixture.Repository.CreateBranch("release/2.0.0"); + + fixture.Repository.CreateBranch("release/2.0.0-xxx"); + fixture.Repository.Checkout("release/2.0.0-xxx"); + fixture.Repository.MakeACommit(); + fixture.AssertFullSemver("2.0.0-beta.1"); + + fixture.Repository.Checkout("release/2.0.0"); + fixture.Repository.MakeACommit(); + fixture.AssertFullSemver("2.0.0-beta.1"); + + fixture.Repository.MergeNoFF("release/2.0.0-xxx"); + fixture.AssertFullSemver("2.0.0-beta.3"); + } + } } \ No newline at end of file From 735cf8a31344cc352f31e5b5293c783947cb8d65 Mon Sep 17 00:00:00 2001 From: Francisco Taborda Date: Sun, 15 May 2016 20:01:54 +0100 Subject: [PATCH 2/2] Updated test MergeOnReleaseBranchShouldNotResetCount to use the latest version of GitTools.Testing --- .../IntegrationTests/ReleaseBranchScenarios.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs index 54ef54d1d1..68958a348b 100644 --- a/src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs +++ b/src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs @@ -334,11 +334,12 @@ public void HotfixOffReleaseBranchShouldNotResetCount() [Test] public void MergeOnReleaseBranchShouldNotResetCount() { - using (var fixture = new EmptyRepositoryFixture(new Config + var config = new Config { AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag, VersioningMode = VersioningMode.ContinuousDeployment, - })) + }; + using (var fixture = new EmptyRepositoryFixture()) { const string TaggedVersion = "1.0.3"; fixture.Repository.MakeATaggedCommit(TaggedVersion); @@ -351,14 +352,14 @@ public void MergeOnReleaseBranchShouldNotResetCount() fixture.Repository.CreateBranch("release/2.0.0-xxx"); fixture.Repository.Checkout("release/2.0.0-xxx"); fixture.Repository.MakeACommit(); - fixture.AssertFullSemver("2.0.0-beta.1"); + fixture.AssertFullSemver(config, "2.0.0-beta.1"); fixture.Repository.Checkout("release/2.0.0"); fixture.Repository.MakeACommit(); - fixture.AssertFullSemver("2.0.0-beta.1"); + fixture.AssertFullSemver(config, "2.0.0-beta.1"); fixture.Repository.MergeNoFF("release/2.0.0-xxx"); - fixture.AssertFullSemver("2.0.0-beta.3"); + fixture.AssertFullSemver(config, "2.0.0-beta.3"); } } } \ No newline at end of file