From 8d347269ee7ed39745a1105523b4f07827be7530 Mon Sep 17 00:00:00 2001 From: Ilya Chudin Date: Mon, 26 Mar 2018 16:38:58 +0400 Subject: [PATCH] Add failing test to PullRequestScenarios --- .../IntegrationTests/PullRequestScenarios.cs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/GitVersionCore.Tests/IntegrationTests/PullRequestScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/PullRequestScenarios.cs index 6bfd403a15..4bdb45f8d0 100644 --- a/src/GitVersionCore.Tests/IntegrationTests/PullRequestScenarios.cs +++ b/src/GitVersionCore.Tests/IntegrationTests/PullRequestScenarios.cs @@ -109,4 +109,19 @@ public void CalculatesCorrectVersionAfterReleaseBranchMergedToMaster() fixture.AssertFullSemver("2.0.0-PullRequest0002.0"); } } -} + + [Test] + public void CalculatesCorrectVersionForPullRequestFromReleaseToMasterInGitFlowBranchingModel() + { + using (var fixture = new BaseGitFlowRepositoryFixture("1.0.0")) + { + fixture.MakeACommit(); + Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("release/2.0.0")); + fixture.MakeACommit(); + + fixture.Repository.CreatePullRequestRef("release/2.0.0", "master", normalise: true); + + fixture.AssertFullSemver("2.0.0-PullRequest0002.0"); + } + } +} \ No newline at end of file