public void GitFlowFeatureBranch()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.SequenceDiagram.Participant("master");
fixture.SequenceDiagram.Participant("develop");
// GitFlow setup
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.2.0");
fixture.BranchTo("develop");
// Branch to develop
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.0-unstable.1");
// Open Pull Request
fixture.BranchTo("feature/myfeature", "feature");
fixture.SequenceDiagram.Activate("feature/myfeature");
fixture.AssertFullSemver("1.3.0-myfeature.1+1");
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.0-myfeature.1+2");
// Merge into develop
fixture.Checkout("develop");
fixture.MergeNoFF("feature/myfeature");
fixture.SequenceDiagram.Destroy("feature/myfeature");
fixture.SequenceDiagram.NoteOver("Feature branches should\r\n" +
"be deleted once merged", "feature/myfeature");
fixture.AssertFullSemver("1.3.0-unstable.3");
}
}
public void NormalisationOfTag()
{
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Repository.MakeACommit();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/foo"));
fixture.Repository.MakeACommit();
fixture.BranchTo("release/2.0.0");
fixture.MakeACommit();
fixture.MakeATaggedCommit("2.0.0-rc.1");
fixture.Checkout("master");
fixture.MergeNoFF("release/2.0.0");
fixture.Repository.Branches.Remove(fixture.Repository.FindBranch("release/2.0.0"));
var remoteTagSha = fixture.Repository.Tags["2.0.0-rc.1"].Target.Sha;
using (var localFixture = fixture.CloneRepository())
{
localFixture.Checkout(remoteTagSha);
GitHelper.NormalizeGitDirectory(localFixture.RepositoryPath, new Authentication(), noFetch: false, currentBranch: string.Empty);
localFixture.AssertFullSemver("2.0.0-rc.1");
}
}
}
public void VerifyDevelopTracksMasterVersion()
{
using var fixture = new EmptyRepositoryFixture();
fixture.Repository.MakeACommit("1");
fixture.MakeATaggedCommit("1.0.0");
fixture.MakeACommit();
// branching increments the version
fixture.BranchTo("develop");
fixture.AssertFullSemver(config, "1.1.0-alpha.0");
fixture.MakeACommit();
fixture.AssertFullSemver(config, "1.1.0-alpha.1");
// merging develop into master increments minor version on master
fixture.Checkout("master");
fixture.MergeNoFF("develop");
fixture.AssertFullSemver(config, "1.1.0");
// a commit on develop before the merge still has the same version number
fixture.Checkout("develop");
fixture.AssertFullSemver(config, "1.1.0-alpha.1");
// moving on to further work on develop tracks master's version from the merge
fixture.MakeACommit();
fixture.AssertFullSemver(config, "1.2.0-alpha.1");
// adding a commit to master increments patch
fixture.Checkout("master");
fixture.MakeACommit();
fixture.AssertFullSemver(config, "1.1.1");
// adding a commit to master doesn't change develop's version
fixture.Checkout("develop");
fixture.AssertFullSemver(config, "1.2.0-alpha.1");
}
public void VerifySupportForwardMerge()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.Repository.MakeACommit("1");
fixture.MakeATaggedCommit("1.0.0");
fixture.MakeACommit(); // 1.0.1
fixture.BranchTo("support/1.0", "support10");
fixture.MakeACommit();
fixture.MakeACommit();
fixture.Checkout("master");
fixture.MakeACommit("+semver: minor");
fixture.AssertFullSemver(config, "1.1.0");
fixture.MergeNoFF("support/1.0");
fixture.AssertFullSemver(config, "1.1.1");
fixture.MakeACommit();
fixture.AssertFullSemver(config, "1.1.2");
fixture.Checkout("support/1.0");
fixture.AssertFullSemver(config, "1.0.4");
fixture.BranchTo("feature/foo", "foo");
fixture.MakeACommit();
fixture.MakeACommit();
fixture.AssertFullSemver(config, "1.0.4-foo.2"); // TODO This probably should be 1.0.5
}
}
public void GitFlowPullRequestBranch()
{
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Participant("master");
fixture.Participant("develop");
// GitFlow setup
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.2.0");
fixture.BranchTo("develop");
// Branch to develop
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.0-unstable.1");
// Open Pull Request
fixture.BranchTo("pull/2/merge", "pr");
fixture.Activate("pull/2/merge");
fixture.AssertFullSemver("1.3.0-PullRequest.2+1");
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.0-PullRequest.2+2");
// Merge into develop
fixture.Checkout("develop");
fixture.MergeNoFF("pull/2/merge");
fixture.Destroy("pull/2/merge");
fixture.NoteOver("Feature branches/pr's should\r\n" +
"be deleted once merged", "pull/2/merge");
fixture.AssertFullSemver("1.3.0-unstable.3");
}
}
public void ShouldPickUpVersionFromMainAfterReleaseBranchMergedBack()
{
var config = new Config
{
Branches = new Dictionary <string, BranchConfig>
{
{
MainBranch, new BranchConfig
{
TracksReleaseBranches = true,
Regex = MainBranch
}
}
}
};
using var fixture = new EmptyRepositoryFixture();
// Create release branch
fixture.MakeACommit();
fixture.BranchTo("release/1.0");
fixture.MakeACommit();
// merge release into main
fixture.Checkout(MainBranch);
fixture.MergeNoFF("release/1.0");
fixture.AssertFullSemver("1.0.1+2", config);
// create a feature branch from main and verify the version
fixture.BranchTo("feature/test");
fixture.AssertFullSemver("1.0.1-test.1+2", config);
}
public void MergingFeatureBranchThatIncrementsMinorNumberIncrementsMinorVersionOfMaster()
{
var currentConfig = new Config
{
VersioningMode = VersioningMode.Mainline,
Branches = new Dictionary <string, BranchConfig>
{
{
"feature", new BranchConfig
{
VersioningMode = VersioningMode.ContinuousDeployment,
Increment = IncrementStrategy.Minor
}
}
}
};
using (var fixture = new EmptyRepositoryFixture())
{
fixture.MakeACommit("first in master");
fixture.MakeATaggedCommit("1.0.0");
fixture.AssertFullSemver(currentConfig, "1.0.0");
fixture.BranchTo("feature/foo", "foo");
fixture.MakeACommit("first in foo");
fixture.MakeACommit("second in foo");
fixture.AssertFullSemver(currentConfig, "1.1.0-foo.2");
fixture.Checkout("master");
fixture.MergeNoFF("feature/foo");
fixture.AssertFullSemver(currentConfig, "1.1.0");
}
}
public void VerifyForwardMerge()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.Repository.MakeACommit("1");
fixture.MakeATaggedCommit("1.0.0");
fixture.MakeACommit(); // 1.0.1
fixture.BranchTo("feature/foo", "foo");
fixture.MakeACommit();
fixture.AssertFullSemver(config, "1.0.2-foo.1");
fixture.MakeACommit();
fixture.AssertFullSemver(config, "1.0.2-foo.2");
fixture.Checkout("master");
fixture.MakeACommit();
fixture.AssertFullSemver(config, "1.0.2");
fixture.Checkout("feature/foo");
// This may seem surprising, but this happens because we branched off mainline
// and incremented. Mainline has then moved on. We do not follow mainline
// in feature branches, you need to merge mainline in to get the mainline version
fixture.AssertFullSemver(config, "1.0.2-foo.2");
fixture.MergeNoFF("master");
fixture.AssertFullSemver(config, "1.0.3-foo.3");
}
}
public void GitHubFlowFeatureBranch()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.SequenceDiagram.Participant("master");
// GitFlow setup
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.2.0");
// Branch to develop
fixture.MakeACommit();
fixture.AssertFullSemver("1.2.1+1");
// Open Pull Request
fixture.BranchTo("feature/myfeature", "feature");
fixture.SequenceDiagram.Activate("feature/myfeature");
fixture.AssertFullSemver("1.2.1-myfeature.1+1");
fixture.MakeACommit();
fixture.AssertFullSemver("1.2.1-myfeature.1+2");
// Merge into master
fixture.Checkout("master");
fixture.MergeNoFF("feature/myfeature");
fixture.SequenceDiagram.Destroy("feature/myfeature");
fixture.SequenceDiagram.NoteOver("Feature branches should\r\n" +
"be deleted once merged", "feature/myfeature");
fixture.AssertFullSemver("1.2.1+3");
}
}
public void GitFlowPullRequestBranch()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.SequenceDiagram.Participant("master");
fixture.SequenceDiagram.Participant("develop");
// GitFlow setup
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.2.0");
fixture.BranchTo("develop");
// Branch to develop
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.0-unstable.1");
// Open Pull Request
fixture.BranchTo("pull/2/merge", "pr");
fixture.SequenceDiagram.Activate("pull/2/merge");
fixture.AssertFullSemver("1.3.0-PullRequest.2+1");
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.0-PullRequest.2+2");
// Merge into develop
fixture.Checkout("develop");
fixture.MergeNoFF("pull/2/merge");
fixture.SequenceDiagram.Destroy("pull/2/merge");
fixture.SequenceDiagram.NoteOver("Feature branches/pr's should\r\n" +
"be deleted once merged", "pull/2/merge");
fixture.AssertFullSemver("1.3.0-unstable.3");
}
}
public void GitFlowHotfixBranch()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.SequenceDiagram.Participant("develop");
fixture.SequenceDiagram.Participant("master");
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.2.0");
// Create hotfix branch
fixture.Checkout("master");
fixture.BranchTo("hotfix/1.2.1", "hotfix");
fixture.SequenceDiagram.Activate("hotfix/1.2.1");
fixture.MakeACommit();
fixture.MakeACommit();
fixture.AssertFullSemver("1.2.1-beta.1+2");
// Apply beta.1 tag should be exact tag
fixture.ApplyTag("1.2.1-beta.1");
fixture.AssertFullSemver("1.2.1-beta.1");
fixture.Checkout("master");
fixture.MergeNoFF("hotfix/1.2.1");
fixture.SequenceDiagram.Destroy("hotfix/1.2.1");
fixture.SequenceDiagram.NoteOver("Hotfix branches are deleted once merged", "hotfix/1.2.1");
fixture.ApplyTag("1.2.1");
}
}
public void GitFlowPullRequestBranch()
{
using var fixture = new EmptyRepositoryFixture();
fixture.SequenceDiagram.Participant(MainBranch);
fixture.SequenceDiagram.Participant("develop");
// GitFlow setup
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.2.0");
fixture.BranchTo("develop");
// Branch to develop
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.0-alpha.1");
// Open Pull Request
fixture.BranchTo("pull/2/merge", "pr");
fixture.SequenceDiagram.Activate("pull/2/merge");
fixture.AssertFullSemver("1.3.0-PullRequest0002.1");
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.0-PullRequest0002.2");
// Merge into develop
fixture.Checkout("develop");
fixture.MergeNoFF("pull/2/merge");
fixture.SequenceDiagram.Destroy("pull/2/merge");
fixture.SequenceDiagram.NoteOver("Feature branches/pr's should\r\n" +
"be deleted once merged", "pull/2/merge");
fixture.AssertFullSemver("1.3.0-alpha.3");
Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
}
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);
}
public void GitFlowPullRequestBranch()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.SequenceDiagram.Participant("master");
fixture.SequenceDiagram.Participant("develop");
// GitFlow setup
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.2.0");
fixture.BranchTo("develop");
// Branch to develop
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.0-alpha.1");
// Open Pull Request
fixture.BranchTo("pull/2/merge", "pr");
fixture.SequenceDiagram.Activate("pull/2/merge");
fixture.AssertFullSemver("1.3.0-PullRequest0002.1");
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.0-PullRequest0002.2");
// Merge into develop
fixture.Checkout("develop");
fixture.MergeNoFF("pull/2/merge");
fixture.SequenceDiagram.Destroy("pull/2/merge");
fixture.SequenceDiagram.NoteOver("Feature branches/pr's should\r\n" +
"be deleted once merged", "pull/2/merge");
fixture.AssertFullSemver("1.3.0-alpha.3");
Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
}
}
public void NormalisationOfTag()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.Repository.MakeACommit();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/foo"));
fixture.Repository.MakeACommit();
fixture.BranchTo("release/2.0.0");
fixture.MakeACommit();
fixture.MakeATaggedCommit("2.0.0-rc.1");
fixture.Checkout("master");
fixture.MergeNoFF("release/2.0.0");
fixture.Repository.Branches.Remove(fixture.Repository.Branches["release/2.0.0"]);
var remoteTagSha = fixture.Repository.Tags["2.0.0-rc.1"].Target.Sha;
using (var localFixture = fixture.CloneRepository())
{
localFixture.Checkout(remoteTagSha);
GitRepositoryHelper.NormalizeGitDirectory(localFixture.RepositoryPath, new AuthenticationInfo(), noFetch: false, currentBranch: string.Empty);
localFixture.Repository.Head.FriendlyName.ShouldBe("(no branch)");
localFixture.Repository.Head.Tip.Sha.ShouldBe(remoteTagSha);
}
}
}
public void NormalisationOfTag()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.Repository.MakeACommit();
fixture.Repository.Checkout(fixture.Repository.CreateBranch("feature/foo"));
fixture.Repository.MakeACommit();
fixture.BranchTo("release/2.0.0");
fixture.MakeACommit();
fixture.MakeATaggedCommit("2.0.0-rc.1");
fixture.Checkout("master");
fixture.MergeNoFF("release/2.0.0");
fixture.Repository.Branches.Remove(fixture.Repository.Branches["release/2.0.0"]);
var remoteTagSha = fixture.Repository.Tags["2.0.0-rc.1"].Target.Sha;
using (var localFixture = fixture.CloneRepository())
{
localFixture.Checkout(remoteTagSha);
GitRepositoryHelper.NormalizeGitDirectory(localFixture.RepositoryPath, new AuthenticationInfo(), noFetch: false, currentBranch: string.Empty);
localFixture.Repository.Head.FriendlyName.ShouldBe("(no branch)");
localFixture.Repository.Head.Tip.Sha.ShouldBe(remoteTagSha);
}
}
}
public void ShouldPickUpVersionFromMasterAfterReleaseBranchMergedBack()
{
var config = new Config
{
Branches = new Dictionary <string, BranchConfig>
{
{
"master", new BranchConfig()
{
TracksReleaseBranches = true,
Regex = "master"
}
}
}
};
using (var fixture = new EmptyRepositoryFixture())
{
// Create release branch
fixture.MakeACommit();
fixture.BranchTo("release/1.0");
fixture.MakeACommit();
// merge release into master
fixture.Checkout("master");
fixture.MergeNoFF("release/1.0");
fixture.AssertFullSemver(config, "1.0.1+2");
// create a misnamed feature branch (i.e. it uses the default config) from master and verify the version
fixture.BranchTo("misnamed");
fixture.AssertFullSemver(config, "1.0.1-misnamed.1+2");
}
}
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 void MergeFeatureIntoMainlineWithMinorIncrement()
{
var config = new Config
{
VersioningMode = VersioningMode.Mainline,
Branches = new Dictionary <string, BranchConfig>()
{
{ "feature", new BranchConfig {
Increment = IncrementStrategy.Minor
} }
},
Ignore = new IgnoreConfig()
{
ShAs = new List <string>()
},
MergeMessageFormats = new Dictionary <string, string>()
};
using var fixture = new EmptyRepositoryFixture();
fixture.MakeACommit();
fixture.ApplyTag("1.0.0");
fixture.AssertFullSemver("1.0.0", config);
fixture.BranchTo("feature/foo");
fixture.MakeACommit();
fixture.AssertFullSemver("1.1.0-foo.1", config);
fixture.ApplyTag("1.1.0-foo.1");
fixture.Checkout("master");
fixture.MergeNoFF("feature/foo");
fixture.AssertFullSemver("1.1.0", config);
}
public void GitFlowHotfixBranch()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.SequenceDiagram.Participant("develop");
fixture.SequenceDiagram.Participant("master");
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.2.0");
// Create hotfix branch
fixture.Checkout("master");
fixture.BranchTo("hotfix/1.2.1", "hotfix");
fixture.SequenceDiagram.Activate("hotfix/1.2.1");
fixture.MakeACommit();
fixture.MakeACommit();
fixture.AssertFullSemver("1.2.1-beta.1+2");
// Apply beta.1 tag should be exact tag
fixture.ApplyTag("1.2.1-beta.1");
fixture.AssertFullSemver("1.2.1-beta.1");
fixture.Checkout("master");
fixture.MergeNoFF("hotfix/1.2.1");
fixture.SequenceDiagram.Destroy("hotfix/1.2.1");
fixture.SequenceDiagram.NoteOver("Hotfix branches are deleted once merged", "hotfix/1.2.1");
fixture.ApplyTag("1.2.1");
}
}
public void VerifyDevelopFeatureTracksMasterVersion()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.Repository.MakeACommit("1");
fixture.MakeATaggedCommit("1.0.0");
fixture.MakeACommit();
// branching increments the version
fixture.BranchTo("develop");
fixture.AssertFullSemver(config, "1.1.0-alpha.0");
fixture.MakeACommit();
fixture.AssertFullSemver(config, "1.1.0-alpha.1");
// merging develop into master increments minor version on master
fixture.Checkout("master");
fixture.MergeNoFF("develop");
fixture.AssertFullSemver(config, "1.1.0");
// a commit on develop before the merge still has the same version number
fixture.Checkout("develop");
fixture.AssertFullSemver(config, "1.1.0-alpha.1");
// a branch from develop before the merge tracks the pre-merge version from master
// (note: the commit on develop looks like a commit to this branch, thus the .1)
fixture.BranchTo("feature/foo");
fixture.AssertFullSemver(config, "1.0.2-foo.1");
// further work on the branch tracks the merged version from master
fixture.MakeACommit();
fixture.AssertFullSemver(config, "1.1.1-foo.1");
// adding a commit to master increments patch
fixture.Checkout("master");
fixture.MakeACommit();
fixture.AssertFullSemver(config, "1.1.1");
// adding a commit to master doesn't change the feature's version
fixture.Checkout("feature/foo");
fixture.AssertFullSemver(config, "1.1.1-foo.1");
// merging the feature to develop increments develop
fixture.Checkout("develop");
fixture.MergeNoFF("feature/foo");
fixture.AssertFullSemver(config, "1.2.0-alpha.2");
}
}
public void CommitOnDevelop_AfterReleaseBranchMergeToDevelop_ShouldNotResetCount()
{
var config = new Config
{
VersioningMode = VersioningMode.ContinuousDeployment
};
using (var fixture = new EmptyRepositoryFixture())
{
fixture.MakeACommit("initial");
fixture.BranchTo("develop");
// Create release from develop
fixture.BranchTo("release-2.0.0");
fixture.AssertFullSemver(config, "2.0.0-beta.0");
// Make some commits on release
fixture.MakeACommit("release 1");
fixture.MakeACommit("release 2");
fixture.AssertFullSemver(config, "2.0.0-beta.2");
// First forward merge release to develop
fixture.Checkout("develop");
fixture.MergeNoFF("release-2.0.0");
// Make some new commit on release
fixture.Checkout("release-2.0.0");
fixture.Repository.MakeACommit("release 3 - after first merge");
fixture.AssertFullSemver(config, "2.0.0-beta.3");
// Make new commit on develop
fixture.Checkout("develop");
// Checkout to release (no new commits)
fixture.Checkout("release-2.0.0");
fixture.AssertFullSemver(config, "2.0.0-beta.3");
fixture.Checkout("develop");
fixture.Repository.MakeACommit("develop after merge");
// Checkout to release (no new commits)
fixture.Checkout("release-2.0.0");
fixture.AssertFullSemver(config, "2.0.0-beta.3");
// Make some new commit on release
fixture.Repository.MakeACommit("release 4");
fixture.Repository.MakeACommit("release 5");
fixture.AssertFullSemver(config, "2.0.0-beta.5");
// Second merge release to develop
fixture.Checkout("develop");
fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
// Checkout to release (no new commits)
fixture.Checkout("release-2.0.0");
fixture.AssertFullSemver(config, "2.0.0-beta.5");
}
}
public void FindsCorrectMergeBaseForForwardMergeMovesOn()
{
//*9dfb8b4 49 minutes ago(develop)
//*54f21b2 53 minutes ago
// |\
// | | *a219831 51 minutes ago(HEAD -> release-2.0.0)
// | |/
// | *4441531 54 minutes ago
// | *89840df 56 minutes ago
// |/
//*91bf945 58 minutes ago(master)
using (var fixture = new EmptyRepositoryFixture())
{
fixture.MakeACommit("initial");
fixture.BranchTo("develop");
var expectedReleaseMergeBase = fixture.Repository.Head.Tip;
// Create release from develop
fixture.BranchTo("release-2.0.0");
// Make some commits on release
fixture.MakeACommit("release 1");
fixture.MakeACommit("release 2");
var expectedDevelopMergeBase = fixture.Repository.Head.Tip;
// First forward merge release to develop
fixture.Checkout("develop");
fixture.MergeNoFF("release-2.0.0");
// Make some new commit on release
fixture.Checkout("release-2.0.0");
fixture.MakeACommit("release 3 - after first merge");
// Make new commit on develop
fixture.Checkout("develop");
// Checkout to release (no new commits)
fixture.MakeACommit("develop after merge");
// Checkout to release (no new commits)
fixture.Checkout("release-2.0.0");
var develop = fixture.Repository.FindBranch("develop");
var release = fixture.Repository.FindBranch("release-2.0.0");
var releaseBranchMergeBase = new GitRepoMetadataProvider(fixture.Repository)
.FindMergeBase(release, develop);
var developMergeBase = new GitRepoMetadataProvider(fixture.Repository)
.FindMergeBase(develop, release);
fixture.Repository.DumpGraph(Console.WriteLine);
releaseBranchMergeBase.ShouldBe(expectedReleaseMergeBase);
developMergeBase.ShouldBe(expectedDevelopMergeBase);
}
}
public void VerifyMergingMainToFeatureDoesNotStopMainCommitsIncrementingVersion()
{
using var fixture = new EmptyRepositoryFixture();
fixture.MakeACommit($"first in {MainBranch}");
fixture.BranchTo("feature/foo", "foo");
fixture.MakeACommit("first in foo");
fixture.Checkout(MainBranch);
fixture.MakeATaggedCommit("1.0.0");
fixture.MakeACommit($"third in {MainBranch}");
fixture.Checkout("feature/foo");
fixture.MergeNoFF(MainBranch);
fixture.MakeACommit("second in foo");
fixture.Checkout(MainBranch);
fixture.MergeNoFF("feature/foo");
fixture.AssertFullSemver("1.0.2", config);
}
public void VerifyMergingMasterToFeatureDoesNotCauseBranchCommitsToIncrementVersion()
{
using var fixture = new EmptyRepositoryFixture();
fixture.MakeACommit("first in master");
fixture.BranchTo("feature/foo", "foo");
fixture.MakeACommit("first in foo");
fixture.Checkout("master");
fixture.MakeACommit("second in master");
fixture.Checkout("feature/foo");
fixture.MergeNoFF("master");
fixture.MakeACommit("second in foo");
fixture.Checkout("master");
fixture.MakeATaggedCommit("1.0.0");
fixture.MergeNoFF("feature/foo");
fixture.AssertFullSemver("1.0.1", config);
}
public void VerifyIssue1154CanForwardMergeMainToFeatureBranch()
{
using var fixture = new EmptyRepositoryFixture();
fixture.MakeACommit();
fixture.BranchTo("feature/branch2");
fixture.BranchTo("feature/branch1");
fixture.MakeACommit();
fixture.MakeACommit();
fixture.Checkout(MainBranch);
fixture.MergeNoFF("feature/branch1");
fixture.AssertFullSemver("0.1.1", config);
fixture.Checkout("feature/branch2");
fixture.MakeACommit();
fixture.MakeACommit();
fixture.MakeACommit();
fixture.MergeNoFF(MainBranch);
fixture.AssertFullSemver("0.1.2-branch2.4", config);
}
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(expectedFullSemVer, config);
}
public void VerifyMergingMasterToFeatureDoesNotStopMasterCommitsIncrementingVersion()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.MakeACommit("first in master");
fixture.BranchTo("feature/foo", "foo");
fixture.MakeACommit("first in foo");
fixture.Checkout("master");
fixture.MakeATaggedCommit("1.0.0");
fixture.MakeACommit("third in master");
fixture.Checkout("feature/foo");
fixture.MergeNoFF("master");
fixture.MakeACommit("second in foo");
fixture.Checkout("master");
fixture.MergeNoFF("feature/foo");
fixture.AssertFullSemver(config, "1.0.2");
}
}
public void TheReadmeSample()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.MakeACommit();
fixture.MakeACommit();
fixture.MakeATaggedCommit("1.0.0");
fixture.BranchTo("develop");
fixture.MakeACommit();
fixture.Checkout("master");
fixture.MergeNoFF("develop");
}
}
public void VerifyIssue1154_CanForwardMergeMasterToFeatureBranch()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.MakeACommit();
fixture.BranchTo("feature/branch2");
fixture.BranchTo("feature/branch1");
fixture.MakeACommit();
fixture.MakeACommit();
fixture.Checkout("master");
fixture.MergeNoFF("feature/branch1");
fixture.AssertFullSemver(config, "0.1.1");
fixture.Checkout("feature/branch2");
fixture.MakeACommit();
fixture.MakeACommit();
fixture.MakeACommit();
fixture.MergeNoFF("master");
fixture.AssertFullSemver(config, "0.1.2-branch2.4");
}
}
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);
}
}
public void TheReadmeSample()
{
using (LogHelper.Capture(_outputHelper, LogProvider.SetCurrentLogProvider))
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.MakeACommit();
fixture.MakeACommit();
fixture.MakeATaggedCommit("1.0.0");
fixture.BranchTo("develop");
fixture.MakeACommit();
fixture.Checkout("master");
fixture.MergeNoFF("develop");
}
}
}
public void TheReadmeSample()
{
using (LogHelper.Capture(_outputHelper, LogProvider.SetCurrentLogProvider))
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.MakeACommit();
fixture.MakeACommit();
fixture.MakeATaggedCommit("1.0.0");
fixture.BranchTo("develop");
fixture.MakeACommit();
fixture.Checkout("master");
fixture.MergeNoFF("develop");
}
}
}
public void VerifyNonMainMainlineVersionIdenticalAsMain()
{
using var fixture = new EmptyRepositoryFixture();
fixture.Repository.MakeACommit("1");
fixture.BranchTo("feature/foo", "foo");
fixture.MakeACommit("2 +semver: major");
fixture.Checkout(MainBranch);
fixture.MergeNoFF("feature/foo");
fixture.AssertFullSemver("1.0.0", config);
fixture.BranchTo("support/1.0", "support");
fixture.AssertFullSemver("1.0.0", config);
}
// Copied from GitVersion, to attempt fixing this bug: https://travis-ci.org/GitTools/GitVersion/jobs/171288284#L2025
public void GitHubFlowMajorRelease()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.SequenceDiagram.Participant("master");
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.3.0");
// Create release branch
fixture.BranchTo("release/2.0.0", "release");
fixture.SequenceDiagram.Activate("release/2.0.0");
fixture.MakeACommit();
// fixture.AssertFullSemver("2.0.0-beta.1+1");
fixture.MakeACommit();
// fixture.AssertFullSemver("2.0.0-beta.1+2");
// Apply beta.1 tag should be exact tag
fixture.ApplyTag("2.0.0-beta.1");
// fixture.AssertFullSemver("2.0.0-beta.1");
// test that the CommitsSinceVersionSource should still return commit count
// var version = fixture.GetVersion();
// version.CommitsSinceVersionSource.ShouldBe("2");
// Make a commit after a tag should bump up the beta
fixture.MakeACommit();
// fixture.AssertFullSemver("2.0.0-beta.2+3");
// Complete release
fixture.Checkout("master");
fixture.MergeNoFF("release/2.0.0");
fixture.SequenceDiagram.Destroy("release/2.0.0");
fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/2.0.0");
//fixture.AssertFullSemver("2.0.0+0");
fixture.ApplyTag("2.0.0");
// fixture.AssertFullSemver("2.0.0");
fixture.MakeACommit();
#if !NETCOREAPP1_1
fixture.Repository.DumpGraph();
#endif
// fixture.AssertFullSemver("2.0.1+1");
}
}
public void MergeIntoMainline()
{
var config = new Config
{
VersioningMode = VersioningMode.Mainline,
NextVersion = "1.0.0"
};
using var fixture = new EmptyRepositoryFixture();
fixture.MakeACommit();
fixture.BranchTo("foo");
fixture.MakeACommit();
fixture.Checkout("master");
fixture.MergeNoFF("foo");
fixture.AssertFullSemver("1.0.0", config);
}
public void ShouldHaveAGreaterSemVerAfterDevelopIsMergedIntoFeature()
{
var config = new Config()
{
VersioningMode = VersioningMode.ContinuousDeployment,
AssemblyVersioningScheme = AssemblyVersioningScheme.Major,
AssemblyFileVersioningFormat = "{MajorMinorPatch}.{env:WeightedPreReleaseNumber ?? 0}",
LegacySemVerPadding = 4,
BuildMetaDataPadding = 4,
CommitsSinceVersionSourcePadding = 4,
CommitMessageIncrementing = CommitMessageIncrementMode.Disabled,
Branches = new Dictionary <string, BranchConfig>
{
{
"develop", new BranchConfig()
{
PreventIncrementOfMergedBranchVersion = true
}
},
{
"feature", new BranchConfig()
{
Tag = "feat-{BranchName}"
}
}
}
};
using (var fixture = new EmptyRepositoryFixture())
{
fixture.MakeACommit();
fixture.BranchTo("develop");
fixture.MakeACommit();
fixture.ApplyTag("16.23.0");
fixture.MakeACommit();
fixture.BranchTo("feature/featX");
fixture.MakeACommit();
fixture.Checkout("develop");
fixture.MakeACommit();
fixture.Checkout("feature/featX");
fixture.MergeNoFF("develop");
fixture.AssertFullSemver(config, "16.24.0-feat-featX.4");
}
}
public void InheritVersionFromReleaseBranch()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.MakeATaggedCommit("1.0.0");
fixture.BranchTo("develop");
fixture.MakeACommit();
fixture.BranchTo("release/2.0.0");
fixture.MakeACommit();
fixture.MakeACommit();
fixture.Checkout("develop");
fixture.AssertFullSemver("1.1.0-alpha.1");
fixture.MakeACommit();
fixture.AssertFullSemver("2.1.0-alpha.1");
fixture.MergeNoFF("release/2.0.0");
fixture.AssertFullSemver("2.1.0-alpha.4");
fixture.BranchTo("feature/MyFeature");
fixture.MakeACommit();
fixture.AssertFullSemver("2.1.0-MyFeature.1+3");
}
}
public void ShouldPickUpVersionFromDevelopAfterReleaseBranchMergedBack()
{
using (var fixture = new EmptyRepositoryFixture())
{
// Create develop and release branches
fixture.MakeACommit();
fixture.BranchTo("develop");
fixture.MakeACommit();
fixture.BranchTo("release/1.0");
fixture.MakeACommit();
// merge release into develop
fixture.Checkout("develop");
fixture.MergeNoFF("release/1.0");
fixture.AssertFullSemver("1.1.0-alpha.2");
// create a misnamed feature branch (i.e. it uses the default config) from develop and verify the version
fixture.BranchTo("misnamed");
fixture.AssertFullSemver("1.1.0-misnamed.1+2");
}
}
public void GitHubFlowMajorRelease()
{
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Participant("master");
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.3.0");
// Create release branch
fixture.BranchTo("release/2.0.0", "release");
fixture.Activate("release/2.0.0");
fixture.MakeACommit();
fixture.AssertFullSemver("2.0.0-beta.1+1");
fixture.MakeACommit();
fixture.AssertFullSemver("2.0.0-beta.1+2");
// Apply beta.1 tag should be exact tag
fixture.ApplyTag("2.0.0-beta.1");
fixture.AssertFullSemver("2.0.0-beta.1");
// Make a commit after a tag should bump up the beta
fixture.MakeACommit();
fixture.AssertFullSemver("2.0.0-beta.2+3");
// Complete release
fixture.Checkout("master");
fixture.MergeNoFF("release/2.0.0");
fixture.Destroy("release/2.0.0");
fixture.NoteOver("Release branches are deleted once merged", "release/2.0.0");
fixture.AssertFullSemver("2.0.0+0");
fixture.ApplyTag("2.0.0");
fixture.AssertFullSemver("2.0.0");
fixture.MakeACommit();
fixture.Repository.DumpGraph();
fixture.AssertFullSemver("2.0.1+1");
}
}
public void GitFlowSupportHotfixRelease()
{
using (var fixture = new EmptyRepositoryFixture(new Config()))
{
fixture.Participant("develop");
fixture.Participant("master");
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.3.0");
// GitFlow setup
fixture.Repository.MakeACommit();
fixture.BranchTo("develop");
fixture.NoteOver("Create 2.0.0 release and complete", "develop", "master");
fixture.Checkout("master");
fixture.ApplyTag("2.0.0");
// Create hotfix branch
fixture.Checkout("1.3.0");
fixture.BranchToFromTag("support/1.x", "1.3.0", "master", "support");
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.1+1");
fixture.BranchTo("hotfix/1.3.1", "hotfix2");
fixture.Activate("hotfix/1.3.1");
fixture.MakeACommit();
fixture.MakeACommit();
fixture.AssertFullSemver("1.3.1-beta.1+3");
// Apply beta.1 tag should be exact tag
fixture.ApplyTag("1.3.1-beta.1");
fixture.AssertFullSemver("1.3.1-beta.1");
fixture.Checkout("support/1.x");
fixture.MergeNoFF("hotfix/1.3.1");
fixture.Destroy("hotfix/1.3.1");
fixture.NoteOver("Hotfix branches are deleted once merged", "hotfix/1.3.1");
fixture.AssertFullSemver("1.3.1+4");
fixture.ApplyTag("1.3.1");
fixture.AssertFullSemver("1.3.1");
}
}
public void ShouldPickUpVersionFromMasterAfterReleaseBranchMergedBack()
{
var config = new Config
{
Branches = new Dictionary<string, BranchConfig>
{
{
"master", new BranchConfig()
{
TracksReleaseBranches = true,
Regex = "master"
}
}
}
};
using (var fixture = new EmptyRepositoryFixture())
{
// Create release branch
fixture.MakeACommit();
fixture.BranchTo("release/1.0");
fixture.MakeACommit();
// merge release into master
fixture.Checkout("master");
fixture.MergeNoFF("release/1.0");
fixture.AssertFullSemver(config, "1.0.1+2");
// create a feature branch from master and verify the version
fixture.BranchTo("feature/test");
fixture.AssertFullSemver(config, "1.0.1-test.1+2");
}
}
public void GitFlowSupportMinorRelease()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.SequenceDiagram.Participant("develop");
fixture.SequenceDiagram.Participant("master");
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.3.0");
// GitFlow setup
fixture.Repository.MakeACommit();
fixture.BranchTo("develop");
fixture.SequenceDiagram.NoteOver("Create 2.0.0 release and complete", "develop", "master");
fixture.Checkout("master");
fixture.ApplyTag("2.0.0");
// Create hotfix branch
fixture.Checkout("1.3.0");
fixture.BranchToFromTag("support/1.x", "1.3.0", "master", "support");
fixture.SequenceDiagram.NoteOver("Create 1.3.1 release and complete", "master", "support/1.x");
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.3.1");
fixture.BranchTo("release/1.4.0", "supportRelease");
fixture.SequenceDiagram.Activate("release/1.4.0");
fixture.MakeACommit();
fixture.MakeACommit();
fixture.AssertFullSemver("1.4.0-beta.1+2");
// Apply beta.1 tag should be exact tag
fixture.ApplyTag("1.4.0-beta.1");
fixture.AssertFullSemver("1.4.0-beta.1");
fixture.Checkout("support/1.x");
fixture.MergeNoFF("release/1.4.0");
fixture.SequenceDiagram.Destroy("release/1.4.0");
fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/1.4.0");
fixture.AssertFullSemver("1.4.0+0");
fixture.ApplyTag("1.4.0");
fixture.AssertFullSemver("1.4.0");
}
}
public void VerifySupportForwardMerge()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.Repository.MakeACommit("1");
fixture.MakeATaggedCommit("1.0.0");
fixture.MakeACommit(); // 1.0.1
fixture.BranchTo("support/1.0", "support10");
fixture.MakeACommit();
fixture.MakeACommit();
fixture.Checkout("master");
fixture.MakeACommit("+semver: minor");
fixture.AssertFullSemver(config, "1.1.0");
fixture.MergeNoFF("support/1.0");
fixture.AssertFullSemver(config, "1.1.1");
fixture.MakeACommit();
fixture.AssertFullSemver(config, "1.1.2");
fixture.Checkout("support/1.0");
fixture.AssertFullSemver(config, "1.0.4");
fixture.BranchTo("feature/foo", "foo");
fixture.MakeACommit();
fixture.MakeACommit();
fixture.AssertFullSemver(config, "1.0.4-foo.2"); // TODO This probably should be 1.0.5
}
}
public void VerifyForwardMerge()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.Repository.MakeACommit("1");
fixture.MakeATaggedCommit("1.0.0");
fixture.MakeACommit(); // 1.0.1
fixture.BranchTo("feature/foo", "foo");
fixture.MakeACommit();
fixture.MakeACommit();
fixture.AssertFullSemver(config, "1.0.2-foo.2");
fixture.Checkout("master");
fixture.MakeACommit();
fixture.AssertFullSemver(config, "1.0.2");
fixture.Checkout("feature/foo");
fixture.MergeNoFF("master");
fixture.AssertFullSemver(config, "1.0.3-foo.3");
}
}
public void MergedFeatureBranchesToMasterImpliesRelease()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.Repository.MakeACommit("1");
fixture.MakeATaggedCommit("1.0.0");
fixture.BranchTo("feature/foo", "foo");
fixture.MakeACommit("2");
fixture.AssertFullSemver(config, "1.0.1-foo.1");
fixture.MakeACommit("2.1");
fixture.AssertFullSemver(config, "1.0.1-foo.2");
fixture.Checkout("master");
fixture.MergeNoFF("feature/foo");
fixture.AssertFullSemver(config, "1.0.1");
fixture.BranchTo("feature/foo2", "foo2");
fixture.MakeACommit("3 +semver: minor");
fixture.AssertFullSemver(config, "1.1.0-foo2.1");
fixture.Checkout("master");
fixture.MergeNoFF("feature/foo2");
fixture.AssertFullSemver(config, "1.1.0");
fixture.BranchTo("feature/foo3", "foo3");
fixture.MakeACommit("4");
fixture.Checkout("master");
fixture.MergeNoFF("feature/foo3");
fixture.SequenceDiagram.NoteOver("Merge message contains '+semver: minor'", "master");
var commit = fixture.Repository.Head.Tip;
// Put semver increment in merge message
fixture.Repository.Commit(commit.Message + " +semver: minor", commit.Author, commit.Committer, new CommitOptions
{
AmendPreviousCommit = true
});
fixture.AssertFullSemver(config, "1.2.0");
fixture.BranchTo("feature/foo4", "foo4");
fixture.MakeACommit("5 +semver: major");
fixture.AssertFullSemver(config, "2.0.0-foo4.1");
fixture.Checkout("master");
fixture.MergeNoFF("feature/foo4");
fixture.AssertFullSemver(config, "2.0.0");
// We should evaluate any commits not included in merge commit calculations for direct commit/push or squash to merge commits
fixture.MakeACommit("6 +semver: major");
fixture.AssertFullSemver(config, "3.0.0");
fixture.MakeACommit("7 +semver: minor");
fixture.AssertFullSemver(config, "3.1.0");
fixture.MakeACommit("8");
fixture.AssertFullSemver(config, "3.1.1");
// Finally verify that the merge commits still function properly
fixture.BranchTo("feature/foo5", "foo5");
fixture.MakeACommit("9 +semver: minor");
fixture.AssertFullSemver(config, "3.2.0-foo5.1");
fixture.Checkout("master");
fixture.MergeNoFF("feature/foo5");
fixture.AssertFullSemver(config, "3.2.0");
// One more direct commit for good measure
fixture.MakeACommit("10 +semver: minor");
fixture.AssertFullSemver(config, "3.3.0");
// And we can commit without bumping semver
fixture.MakeACommit("11 +semver: none");
fixture.AssertFullSemver(config, "3.3.0");
Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
}
}
public void GitHubFlowMajorRelease()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.SequenceDiagram.Participant("master");
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.3.0");
// Create release branch
fixture.BranchTo("release/2.0.0", "release");
fixture.SequenceDiagram.Activate("release/2.0.0");
fixture.MakeACommit();
fixture.AssertFullSemver("2.0.0-beta.1+1");
fixture.MakeACommit();
fixture.AssertFullSemver("2.0.0-beta.1+2");
// Apply beta.1 tag should be exact tag
fixture.ApplyTag("2.0.0-beta.1");
fixture.AssertFullSemver("2.0.0-beta.1");
// test that the CommitsSinceVersionSource should still return commit count
var version = fixture.GetVersion(new Config());
version.CommitsSinceVersionSource.ShouldBe("2");
// Make a commit after a tag should bump up the beta
fixture.MakeACommit();
fixture.AssertFullSemver("2.0.0-beta.2+3");
// Complete release
fixture.Checkout("master");
fixture.MergeNoFF("release/2.0.0");
fixture.SequenceDiagram.Destroy("release/2.0.0");
fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/2.0.0");
fixture.AssertFullSemver("2.0.0+0");
fixture.ApplyTag("2.0.0");
fixture.AssertFullSemver("2.0.0");
fixture.MakeACommit();
fixture.Repository.DumpGraph();
fixture.AssertFullSemver("2.0.1+1");
}
}
public void VerifyMergingMasterIntoAFeatureBranchWorksWithMultipleBranches()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.MakeACommit("first in master");
fixture.BranchTo("feature/foo", "foo");
fixture.MakeACommit("first in foo");
fixture.BranchTo("feature/bar", "bar");
fixture.MakeACommit("first in bar");
fixture.Checkout("master");
fixture.MakeACommit("second in master");
fixture.Checkout("feature/foo");
fixture.MergeNoFF("master");
fixture.MakeACommit("second in foo");
fixture.Checkout("feature/bar");
fixture.MergeNoFF("master");
fixture.MakeACommit("second in bar");
fixture.Checkout("master");
fixture.MakeATaggedCommit("1.0.0");
fixture.MergeNoFF("feature/foo");
fixture.MergeNoFF("feature/bar");
fixture.AssertFullSemver(config, "1.0.2");
}
}
public void GitFlowMajorRelease()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.SequenceDiagram.Participant("master");
fixture.SequenceDiagram.Participant("develop");
fixture.Repository.MakeACommit();
fixture.ApplyTag("1.3.0");
// GitFlow setup
fixture.BranchTo("develop");
fixture.MakeACommit();
// Create release branch
fixture.BranchTo("release/2.0.0", "release");
fixture.SequenceDiagram.Activate("release/2.0.0");
fixture.AssertFullSemver("2.0.0-beta.1+0");
// Make another commit on develop
fixture.Checkout("develop");
fixture.MakeACommit();
fixture.AssertFullSemver("1.4.0-unstable.2");
// Make a commit to release-2.0.0
fixture.Checkout("release/2.0.0");
fixture.MakeACommit();
fixture.AssertFullSemver("2.0.0-beta.1+1");
// Apply beta.1 tag should be exact tag
fixture.ApplyTag("2.0.0-beta.1");
fixture.AssertFullSemver("2.0.0-beta.1");
// Make a commit after a tag should bump up the beta
fixture.MakeACommit();
fixture.AssertFullSemver("2.0.0-beta.2+2");
// Complete release
fixture.Checkout("master");
fixture.MergeNoFF("release/2.0.0");
fixture.Checkout("develop");
fixture.MergeNoFF("release/2.0.0");
fixture.SequenceDiagram.Destroy("release/2.0.0");
fixture.SequenceDiagram.NoteOver("Release branches are deleted once merged", "release/2.0.0");
fixture.Checkout("master");
fixture.AssertFullSemver("2.0.0+0");
fixture.ApplyTag("2.0.0");
fixture.AssertFullSemver("2.0.0");
// Not 0 for commit count as we can't know the increment rules of the merged branch
fixture.Checkout("develop");
fixture.AssertFullSemver("2.1.0-unstable.2");
}
}
public void VerifyMergingMasterToFeatureDoesNotStopMasterCommitsIncrementingVersion()
{
using (var fixture = new EmptyRepositoryFixture())
{
fixture.MakeACommit("first in master");
fixture.BranchTo("feature/foo", "foo");
fixture.MakeACommit("first in foo");
fixture.Checkout("master");
fixture.MakeATaggedCommit("1.0.0");
fixture.MakeACommit("third in master");
fixture.Checkout("feature/foo");
fixture.MergeNoFF("master");
fixture.MakeACommit("second in foo");
fixture.Checkout("master");
fixture.MergeNoFF("feature/foo");
fixture.AssertFullSemver(config, "1.0.2");
}
}