Skip to content

Demonstration of bugs for issues 1525 & 1526 #1598

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

Closed
wants to merge 2 commits into from
Closed

Demonstration of bugs for issues 1525 & 1526 #1598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7862e6f
Demonstration of bugs for issues 1525 & 1526
Nov 16, 2018
c461535
Merge branch 'main' into feature/failing-tests-for-1526-and-1526
asbjornu Oct 25, 2022
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
37 changes: 37 additions & 0 deletions src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,4 +566,41 @@ public void PreventDecrementationOfVersionsOnTheMainBranch()
// ✅ succeeds as expected
fixture.AssertFullSemver("1.0.0", configurationBuilder.Build());
}

[Test]
public void CommitsSinceVersionSourceGoesDownWhenDeletingAReleaseBranch()
{
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");
fixture.BranchTo("feature/featureA");
fixture.MakeACommit("commit in featureA");
fixture.MakeACommit("commit in featureA");
fixture.Checkout("develop");
fixture.MakeACommit("commit in develop");
fixture.MakeACommit("commit in develop");
fixture.BranchTo("release/1.2.0");
fixture.MakeACommit("commit in release/1.2.0");
fixture.Checkout("feature/featureA");
fixture.MergeNoFF("develop");
fixture.Checkout("develop");
fixture.MergeNoFF("feature/featureA");
fixture.Checkout("master");
fixture.MergeNoFF("release/1.2.0");
fixture.ApplyTag("1.2.0");
fixture.Checkout("develop");
fixture.MergeNoFF("release/1.2.0");
fixture.SequenceDiagram.Destroy("release/1.2.0");
fixture.Repository.Branches.Remove("release/1.2.0");

var expectedFullSemVer = "1.3.0-alpha.6";
fixture.AssertFullSemver(expectedFullSemVer, config);
}
}
26 changes: 26 additions & 0 deletions src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,4 +556,30 @@ public void ShouldHaveAGreaterSemVerAfterDevelopIsMergedIntoFeature()
fixture.MergeNoFF("develop");
fixture.AssertFullSemver("16.24.0-feat-featX.4", configuration);
}

[Test]
public void MergingFromDevelopToFeatureShouldNotCauseMinorPatchToChange()
{
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");
fixture.BranchTo("feature/featureA");
fixture.MakeACommit("commit in featureA");
fixture.MakeACommit("commit in featureA");
fixture.Checkout("develop");
fixture.MakeACommit("commit in develop");
fixture.MakeACommit("commit in develop");
fixture.Checkout("feature/featureA");
fixture.MergeNoFF("develop");

var expectedFullSemVer = "1.2.0-featureA.5";
fixture.AssertFullSemver(expectedFullSemVer, config);
}
}