From 2d192686e562d7260832a7b1fecbef8b4701a383 Mon Sep 17 00:00:00 2001 From: Maxime Beaudry Date: Fri, 19 May 2017 06:07:40 -0400 Subject: [PATCH] Add failing test for issue #1221 --- .../MainlineDevelopmentMode.cs | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/GitVersionCore.Tests/IntegrationTests/MainlineDevelopmentMode.cs b/src/GitVersionCore.Tests/IntegrationTests/MainlineDevelopmentMode.cs index 203085f3d0..400b5582bc 100644 --- a/src/GitVersionCore.Tests/IntegrationTests/MainlineDevelopmentMode.cs +++ b/src/GitVersionCore.Tests/IntegrationTests/MainlineDevelopmentMode.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Reflection; using System.Text; using GitTools.Testing; @@ -303,6 +304,40 @@ public void VerifyMergingMasterIntoAFeatureBranchWorksWithMultipleBranches() fixture.AssertFullSemver(config, "1.0.2"); } } + + [Test] + public void MergingFeatureBranchThatIncrementsMinorNumberIncrementsMinorVersionOfMaster() + { + var currentConfig = new Config + { + VersioningMode = VersioningMode.Mainline, + Branches = new Dictionary + { + { "feature", new BranchConfig + { + VersioningMode = VersioningMode.ContinuousDeployment, + Increment = IncrementStrategy.Minor + } + } + } + }; + + using (var fixture = new EmptyRepositoryFixture()) + { + fixture.MakeACommit("first in master"); + fixture.MakeATaggedCommit("1.0.0"); + fixture.AssertFullSemver(currentConfig, "1.0.0"); + + fixture.BranchTo("feature/foo", "foo"); + fixture.MakeACommit("first in foo"); + fixture.MakeACommit("second in foo"); + fixture.AssertFullSemver(currentConfig, "1.1.0-foo.2"); + + fixture.Checkout("master"); + fixture.MergeNoFF("feature/foo"); + fixture.AssertFullSemver(currentConfig, "1.1.0"); + } + } } static class CommitExtensions