Skip to content

[Bugfix] CommitsSinceVersionSource decreases upon deleting a merged Release branch #1635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asbjornu merged 3 commits into from
Mar 14, 2019
Merged

[Bugfix] CommitsSinceVersionSource decreases upon deleting a merged Release branch #1635

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e351ad4
Added failing testcases for CommitsSinceVersion Source issue (1526)
Mar 7, 2019
c172ffe
Fix the CommitsSinceVersionSource count in case a Release branch was …
Mar 11, 2019
a100491
Remove the hardcoded string to detect a base version calculated using…
Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Added failing testcases for CommitsSinceVersion Source issue (1526)
  • Loading branch information
Ruh Ullah Shah committed Mar 13, 2019
commit e351ad4837fcf1e36b312cf822ff91a9a92e8203
76 changes: 76 additions & 0 deletions src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,4 +222,80 @@ public void TagOnHotfixShouldNotAffectDevelop()
fixture.AssertFullSemver("1.3.0-alpha.2");
}
}

public void CommitsSinceVersionSourceShouldNotGoDownUponGitFlowReleaseFinish()
{
var config = new Config
{
VersioningMode = VersioningMode.ContinuousDeployment
};

using (var fixture = new EmptyRepositoryFixture())
{
fixture.MakeACommit();
fixture.ApplyTag("1.1.0");
fixture.BranchTo("develop");
fixture.MakeACommit("commit in develop - 1");
fixture.AssertFullSemver("1.2.0-alpha.1");
fixture.BranchTo("release/1.2.0");
fixture.AssertFullSemver("1.2.0-beta.1+0");
fixture.Checkout("develop");
fixture.MakeACommit("commit in develop - 2");
fixture.MakeACommit("commit in develop - 3");
fixture.MakeACommit("commit in develop - 4");
fixture.MakeACommit("commit in develop - 5");
fixture.AssertFullSemver("1.3.0-alpha.4");
fixture.Checkout("release/1.2.0");
fixture.MakeACommit("commit in release/1.2.0 - 1");
fixture.MakeACommit("commit in release/1.2.0 - 2");
fixture.MakeACommit("commit in release/1.2.0 - 3");
fixture.AssertFullSemver("1.2.0-beta.1+3");
fixture.Checkout("master");
fixture.MergeNoFF("release/1.2.0");
fixture.ApplyTag("1.2.0");
fixture.Checkout("develop");
fixture.MergeNoFF("release/1.2.0");
fixture.MakeACommit("commit in develop - 6");
fixture.AssertFullSemver("1.3.0-alpha.9");
fixture.SequenceDiagram.Destroy("release/1.2.0");
fixture.Repository.Branches.Remove("release/1.2.0");

var expectedFullSemVer = "1.3.0-alpha.9";
fixture.AssertFullSemver(config, expectedFullSemVer);
}
}

[Test]
public void CommitsSinceVersionSourceShouldNotGoDownUponMergingFeatureOnlyToDevelop()
{
var config = new Config
{
VersioningMode = VersioningMode.ContinuousDeployment
};

using (var fixture = new EmptyRepositoryFixture())
{
fixture.MakeACommit("commit in master - 1");
fixture.ApplyTag("1.1.0");
fixture.BranchTo("develop");
fixture.MakeACommit("commit in develop - 1");
fixture.AssertFullSemver("1.2.0-alpha.1");
fixture.BranchTo("release/1.2.0");
fixture.MakeACommit("commit in release - 1");
fixture.MakeACommit("commit in release - 2");
fixture.MakeACommit("commit in release - 3");
fixture.AssertFullSemver("1.2.0-beta.1+3");
fixture.ApplyTag("1.2.0");
fixture.Checkout("develop");
fixture.MakeACommit("commit in develop - 2");
fixture.AssertFullSemver("1.3.0-alpha.1");
fixture.MergeNoFF("release/1.2.0");
fixture.AssertFullSemver("1.3.0-alpha.5");
fixture.SequenceDiagram.Destroy("release/1.2.0");
fixture.Repository.Branches.Remove("release/1.2.0");

var expectedFullSemVer = "1.3.0-alpha.5";
fixture.AssertFullSemver(config, expectedFullSemVer);
}
}
}