Skip to content

Add various tests for inheriting version numbers in feature branches. #1009

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 10 commits into from
Closed

Add various tests for inheriting version numbers in feature branches. #1009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
818fafc
Add various tests for inheriting version numbers in feature branches.
DanielRose Aug 16, 2016
bf48676
Test for picking up version number from parent branch.
DanielRose Sep 23, 2016
fb4bb19
Add Regex for custom branch configs.
DanielRose Sep 23, 2016
c1adffe
Add comments.
DanielRose Sep 30, 2016
0821666
When the increment strategy is Inherit, use the first value of the pa…
DanielRose Sep 30, 2016
46e1a1c
Put the name of the branch configuration in BranchConfig.
DanielRose Oct 4, 2016
a765000
Use new struct BranchCommit to lose less information. Use ExcludingBr…
DanielRose Oct 4, 2016
80eaf8e
Use the first found parent branch.
DanielRose Oct 4, 2016
f3cbcf8
Store the excluded branches in a HashSet.
DanielRose Oct 4, 2016
b24c817
Use parent branches's configuration.
DanielRose Nov 16, 2016
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
3 changes: 2 additions & 1 deletion src/GitVersionCore.Tests/GitToolsTestingExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
namespace GitVersionCore.Tests
{
using System;
using System.Linq;
using GitTools;
using GitTools.Testing;
using GitVersion;
Expand All @@ -24,7 +25,7 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co
}
var gitVersionContext = new GitVersionContext(repository ?? fixture.Repository, configuration, isForTrackedBranchOnly, commitId);
var executeGitVersion = ExecuteGitVersion(gitVersionContext);
var variables = VariableProvider.GetVariablesFor(executeGitVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);
var variables = VariableProvider.GetVariablesFor(executeGitVersion, gitVersionContext.Configurations.First(), gitVersionContext.IsCurrentCommitTagged);
try
{
return variables;
Expand Down
7 changes: 4 additions & 3 deletions src/GitVersionCore.Tests/GitVersionContextTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
namespace GitVersionCore.Tests
{
using System.Linq;
using GitTools.Testing;
using GitVersion;
using LibGit2Sharp;
Expand Down Expand Up @@ -28,7 +29,7 @@ public void CanInheritVersioningMode(VersioningMode mode)
};

var context = new GitVersionContext(mockRepository, mockBranch, config);
context.Configuration.VersioningMode.ShouldBe(mode);
context.Configurations.First().VersioningMode.ShouldBe(mode);
}

[Test]
Expand Down Expand Up @@ -59,7 +60,7 @@ public void UsesBranchSpecificConfigOverTopLevelDefaults()
}
};
var context = new GitVersionContext(mockRepository, develop, config);
context.Configuration.Tag.ShouldBe("alpha");
context.Configurations.First().Tag.ShouldBe("alpha");
}

[Test]
Expand All @@ -84,7 +85,7 @@ public void CanFindParentBranchForInheritingIncrementStrategy()
repo.Repository.MakeACommit();

var context = new GitVersionContext(repo.Repository, config);
context.Configuration.Increment.ShouldBe(IncrementStrategy.Major);
context.Configurations.First().Increment.ShouldBe(IncrementStrategy.Major);
}
}
}
Expand Down
Loading