Skip to content

Add some tests for making a feature branch off of a release or a hotfix branch #1596

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 1 commit into from
Feb 20, 2019
Merged

Add some tests for making a feature branch off of a release or a hotfix branch #1596

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
113 changes: 113 additions & 0 deletions src/GitVersionCore.Tests/IntegrationTests/HotfixBranchScenarios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using GitVersionCore.Tests;
using LibGit2Sharp;
using NUnit.Framework;
using GitVersion;

[TestFixture]
public class HotfixBranchScenarios : TestBase
Expand Down Expand Up @@ -123,4 +124,116 @@ public void PatchOlderReleaseExample()
fixture.AssertFullSemver("2.1.0-alpha.7");
}
}

/// <summary>
/// Create a feature branch from a hotfix branch, and merge back, then delete it
/// </summary>
[Test]
public void FeatureOnHotfix_FeatureBranchDeleted()
{
var config = new Config
{
AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag,
VersioningMode = VersioningMode.ContinuousDeployment
};

using (var fixture = new EmptyRepositoryFixture())
{

var release450 = "release/4.5.0";
var hotfix451 = "hotfix/4.5.1";
var support45 = "support/4.5";
var tag450 = "4.5.0";
var featureBranch = "feature/some-bug-fix";

fixture.Repository.MakeACommit("initial");
fixture.Repository.CreateBranch("develop");
Commands.Checkout(fixture.Repository, "develop");

// create release branch
fixture.Repository.CreateBranch(release450);
Commands.Checkout(fixture.Repository, release450);
fixture.AssertFullSemver(config, "4.5.0-beta.0");
fixture.Repository.MakeACommit("blabla");
Commands.Checkout(fixture.Repository, "develop");
fixture.Repository.MergeNoFF(release450, Generate.SignatureNow());
Commands.Checkout(fixture.Repository, "master");
fixture.Repository.MergeNoFF(release450, Generate.SignatureNow());

// create support branch
fixture.Repository.CreateBranch(support45);
Commands.Checkout(fixture.Repository, support45);
fixture.Repository.ApplyTag(tag450);
fixture.AssertFullSemver(config, "4.5.0");

// create hotfix branch
fixture.Repository.CreateBranch(hotfix451);
Commands.Checkout(fixture.Repository, hotfix451);

// feature branch from hotfix
fixture.Repository.CreateBranch(featureBranch);
Commands.Checkout(fixture.Repository, featureBranch);
fixture.Repository.MakeACommit("blabla"); // commit 1
Commands.Checkout(fixture.Repository, hotfix451);
fixture.Repository.MergeNoFF(featureBranch, Generate.SignatureNow()); // commit 2
fixture.Repository.Branches.Remove(featureBranch);
fixture.AssertFullSemver(config, "4.5.1-beta.2");
}
}

/// <summary>
/// Create a feature branch from a hotfix branch, and merge back, but don't delete it
/// </summary>
[Test]
public void FeatureOnHotfix_FeatureBranchNotDeleted()
{
var config = new Config
{
AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag,
VersioningMode = VersioningMode.ContinuousDeployment
};

using (var fixture = new EmptyRepositoryFixture())
{

var release450 = "release/4.5.0";
var hotfix451 = "hotfix/4.5.1";
var support45 = "support/4.5";
var tag450 = "4.5.0";
var featureBranch = "feature/some-bug-fix";

fixture.Repository.MakeACommit("initial");
fixture.Repository.CreateBranch("develop");
Commands.Checkout(fixture.Repository, "develop");

// create release branch
fixture.Repository.CreateBranch(release450);
Commands.Checkout(fixture.Repository, release450);
fixture.AssertFullSemver(config, "4.5.0-beta.0");
fixture.Repository.MakeACommit("blabla");
Commands.Checkout(fixture.Repository, "develop");
fixture.Repository.MergeNoFF(release450, Generate.SignatureNow());
Commands.Checkout(fixture.Repository, "master");
fixture.Repository.MergeNoFF(release450, Generate.SignatureNow());

// create support branch
fixture.Repository.CreateBranch(support45);
Commands.Checkout(fixture.Repository, support45);
fixture.Repository.ApplyTag(tag450);
fixture.AssertFullSemver(config, "4.5.0");

// create hotfix branch
fixture.Repository.CreateBranch(hotfix451);
Commands.Checkout(fixture.Repository, hotfix451);

// feature branch from hotfix
fixture.Repository.CreateBranch(featureBranch);
Commands.Checkout(fixture.Repository, featureBranch);
fixture.Repository.MakeACommit("blabla"); // commit 1
Commands.Checkout(fixture.Repository, hotfix451);
fixture.Repository.MergeNoFF(featureBranch, Generate.SignatureNow()); // commit 2
fixture.AssertFullSemver(config, "4.5.1-beta.2");
}
}

}
73 changes: 73 additions & 0 deletions src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,4 +550,77 @@ public void FeatureFromReleaseBranch_ShouldNotResetCount()
fixture.AssertFullSemver(config, "2.0.0-beta.16");
}
}

/// <summary>
/// Create a feature branch from a release branch, and merge back, then delete it
/// </summary>
[Test]
public void FeatureOnRelease_FeatureBranchDeleted()
{
var config = new Config
{
AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag,
VersioningMode = VersioningMode.ContinuousDeployment
};

using (var fixture = new EmptyRepositoryFixture())
{
var release450 = "release/4.5.0";
var featureBranch = "feature/some-bug-fix";

fixture.Repository.MakeACommit("initial");
fixture.Repository.CreateBranch("develop");
Commands.Checkout(fixture.Repository, "develop");

// begin the release branch
fixture.Repository.CreateBranch(release450);
Commands.Checkout(fixture.Repository, release450);
fixture.AssertFullSemver(config, "4.5.0-beta.0");

fixture.Repository.CreateBranch(featureBranch);
Commands.Checkout(fixture.Repository, featureBranch);
fixture.Repository.MakeACommit("blabla"); // commit 1
Commands.Checkout(fixture.Repository, release450);
fixture.Repository.MergeNoFF(featureBranch, Generate.SignatureNow()); // commit 2
fixture.Repository.Branches.Remove(featureBranch);

fixture.AssertFullSemver(config, "4.5.0-beta.2");
}
}

/// <summary>
/// Create a feature branch from a release branch, and merge back, but don't delete it
/// </summary>
[Test]
public void FeatureOnRelease_FeatureBranchNotDeleted()
{
var config = new Config
{
AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag,
VersioningMode = VersioningMode.ContinuousDeployment
};

using (var fixture = new EmptyRepositoryFixture())
{
var release450 = "release/4.5.0";
var featureBranch = "feature/some-bug-fix";

fixture.Repository.MakeACommit("initial");
fixture.Repository.CreateBranch("develop");
Commands.Checkout(fixture.Repository, "develop");

// begin the release branch
fixture.Repository.CreateBranch(release450);
Commands.Checkout(fixture.Repository, release450);
fixture.AssertFullSemver(config, "4.5.0-beta.0");

fixture.Repository.CreateBranch(featureBranch);
Commands.Checkout(fixture.Repository, featureBranch);
fixture.Repository.MakeACommit("blabla"); // commit 1
Commands.Checkout(fixture.Repository, release450);
fixture.Repository.MergeNoFF(featureBranch, Generate.SignatureNow()); // commit 2

fixture.AssertFullSemver(config, "4.5.0-beta.2");
}
}
}