Skip to content

Demonstration of bugs for issues 1526 & 1526 #1533

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
DOMZE wants to merge 1 commit into from
Closed

Demonstration of bugs for issues 1526 & 1526 #1533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 43 additions & 2 deletions src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using GitTools.Testing;
using GitTools.Testing;
using GitVersion;
using GitVersionCore.Tests;
using LibGit2Sharp;
Expand Down Expand Up @@ -183,4 +183,45 @@ public void InheritVersionFromReleaseBranch()
fixture.AssertFullSemver("2.1.0-MyFeature.1+5");
}
}
}



[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(config, expectedFullSemVer);
}
}
}
28 changes: 28 additions & 0 deletions src/GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,34 @@ public void ShouldPickUpVersionFromDevelopAfterReleaseBranchMergedBack()
}
}

[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(config, expectedFullSemVer);
}
}

public class WhenMasterMarkedAsIsDevelop
{
[Test]
Expand Down