Skip to content

Commit 681a741

Browse files
JakeGinnivanJakeGinnivan
committed
Promoted config up in tests
1 parent 27784e1 commit 681a741

12 files changed

+44
-34
lines changed

‎GitVersionCore.Tests/EmptyRepositoryFixture.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
public class EmptyRepositoryFixture : RepositoryFixtureBase
66
{
7-
public EmptyRepositoryFixture() :
8-
base(CreateNewRepository, new Config())
7+
public EmptyRepositoryFixture(Config config) :
8+
base(CreateNewRepository, config)
99
{
1010
}
1111

‎GitVersionCore.Tests/GitFlow/BaseGitFlowRepositoryFixture.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
using System;
22
using System.IO;
3+
using GitVersion.Configuration;
34
using LibGit2Sharp;
45

56
public class BaseGitFlowRepositoryFixture : EmptyRepositoryFixture
67
{
7-
public BaseGitFlowRepositoryFixture(string initialVersion)
8+
public BaseGitFlowRepositoryFixture(string initialVersion) : base(new Config())
89
{
910
SetupRepo(r => r.MakeATaggedCommit(initialVersion));
1011
}
1112

12-
public BaseGitFlowRepositoryFixture(Action<IRepository> initialMasterAction)
13+
public BaseGitFlowRepositoryFixture(Action<IRepository> initialMasterAction) : base(new Config())
1314
{
1415
SetupRepo(initialMasterAction);
1516
}

‎GitVersionCore.Tests/GitFlow/DevelopScenarios.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using LibGit2Sharp;
1+
using GitVersion.Configuration;
2+
using LibGit2Sharp;
23
using NUnit.Framework;
34

45
[TestFixture]
@@ -7,7 +8,7 @@ public class DevelopScenarios
78
[Test]
89
public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
910
{
10-
using (var fixture = new EmptyRepositoryFixture())
11+
using (var fixture = new EmptyRepositoryFixture(new Config()))
1112
{
1213
fixture.Repository.MakeATaggedCommit("1.0.0");
1314
fixture.Repository.CreateBranch("develop").Checkout();
@@ -18,7 +19,7 @@ public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
1819
[Test]
1920
public void WhenDevelopBranchedFromMasterDetachedHead_MinorIsIncreased()
2021
{
21-
using (var fixture = new EmptyRepositoryFixture())
22+
using (var fixture = new EmptyRepositoryFixture(new Config()))
2223
{
2324
fixture.Repository.MakeATaggedCommit("1.0.0");
2425
fixture.Repository.CreateBranch("develop").Checkout();

‎GitVersionCore.Tests/GitFlow/WikiScenarios.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using LibGit2Sharp;
1+
using GitVersion.Configuration;
2+
using LibGit2Sharp;
23
using NUnit.Framework;
34

45
[TestFixture]
@@ -37,7 +38,7 @@ participant release-1.3.0
3738
[Test]
3839
public void MinorReleaseExample()
3940
{
40-
using (var fixture = new EmptyRepositoryFixture())
41+
using (var fixture = new EmptyRepositoryFixture(new Config()))
4142
{
4243
fixture.Repository.MakeATaggedCommit("1.2.0");
4344

‎GitVersionCore.Tests/GitHubFlow/MasterTests.cs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using LibGit2Sharp;
1+
using GitVersion.Configuration;
2+
using LibGit2Sharp;
23
using NUnit.Framework;
34

45
[TestFixture]
@@ -7,7 +8,7 @@ public class MasterTests
78
[Test]
89
public void GivenARepositoryWithCommitsButNoTags_VersionShouldBe_0_1()
910
{
10-
using (var fixture = new EmptyRepositoryFixture())
11+
using (var fixture = new EmptyRepositoryFixture(new Config()))
1112
{
1213
// Given
1314
fixture.Repository.MakeACommit();
@@ -22,7 +23,7 @@ public void GivenARepositoryWithCommitsButNoTags_VersionShouldBe_0_1()
2223
[Test]
2324
public void GivenARepositoryWithCommitsButNoTagsWithDetachedHead_VersionShouldBe_0_1()
2425
{
25-
using (var fixture = new EmptyRepositoryFixture())
26+
using (var fixture = new EmptyRepositoryFixture(new Config()))
2627
{
2728
// Given
2829
fixture.Repository.MakeACommit();
@@ -41,7 +42,7 @@ public void GivenARepositoryWithCommitsButNoTagsWithDetachedHead_VersionShouldBe
4142
[Test]
4243
public void GivenARepositoryWithNoTagsAndANextVersionTxtFile_VersionShouldMatchVersionTxtFile()
4344
{
44-
using (var fixture = new EmptyRepositoryFixture())
45+
using (var fixture = new EmptyRepositoryFixture(new Config()))
4546
{
4647
const string ExpectedNextVersion = "1.0.0";
4748
fixture.Repository.MakeACommit();
@@ -56,7 +57,7 @@ public void GivenARepositoryWithNoTagsAndANextVersionTxtFile_VersionShouldMatchV
5657
[Test]
5758
public void GivenARepositoryWithTagAndANextVersionTxtFile_VersionShouldMatchVersionTxtFile()
5859
{
59-
using (var fixture = new EmptyRepositoryFixture())
60+
using (var fixture = new EmptyRepositoryFixture(new Config()))
6061
{
6162
const string ExpectedNextVersion = "1.1.0";
6263
const string TaggedVersion = "1.0.3";
@@ -71,7 +72,7 @@ public void GivenARepositoryWithTagAndANextVersionTxtFile_VersionShouldMatchVers
7172
[Test]
7273
public void GivenARepositoryWithTagAndANextVersionTxtFileAndNoCommits_VersionShouldBeTag()
7374
{
74-
using (var fixture = new EmptyRepositoryFixture())
75+
using (var fixture = new EmptyRepositoryFixture(new Config()))
7576
{
7677
const string ExpectedNextVersion = "1.1.0";
7778
const string TaggedVersion = "1.0.3";
@@ -85,7 +86,7 @@ public void GivenARepositoryWithTagAndANextVersionTxtFileAndNoCommits_VersionSho
8586
[Test]
8687
public void GivenARepositoryWithTagAndNoNextVersionTxtFile_VersionShouldBeTagWithBumpedPatch()
8788
{
88-
using (var fixture = new EmptyRepositoryFixture())
89+
using (var fixture = new EmptyRepositoryFixture(new Config()))
8990
{
9091
const string TaggedVersion = "1.0.3";
9192
fixture.Repository.MakeATaggedCommit(TaggedVersion);
@@ -98,7 +99,7 @@ public void GivenARepositoryWithTagAndNoNextVersionTxtFile_VersionShouldBeTagWit
9899
[Test]
99100
public void GivenARepositoryWithTagAndNoNextVersionTxtFileAndNoCommits_VersionShouldBeTag()
100101
{
101-
using (var fixture = new EmptyRepositoryFixture())
102+
using (var fixture = new EmptyRepositoryFixture(new Config()))
102103
{
103104
const string TaggedVersion = "1.0.3";
104105
fixture.Repository.MakeATaggedCommit(TaggedVersion);
@@ -110,7 +111,7 @@ public void GivenARepositoryWithTagAndNoNextVersionTxtFileAndNoCommits_VersionSh
110111
[Test]
111112
public void GivenARepositoryWithTagAndOldNextVersionTxtFile_VersionShouldBeTagWithBumpedPatch()
112113
{
113-
using (var fixture = new EmptyRepositoryFixture())
114+
using (var fixture = new EmptyRepositoryFixture(new Config()))
114115
{
115116
const string NextVersionTxt = "1.0.0";
116117
const string TaggedVersion = "1.1.0";
@@ -125,7 +126,7 @@ public void GivenARepositoryWithTagAndOldNextVersionTxtFile_VersionShouldBeTagWi
125126
[Test]
126127
public void GivenARepositoryWithTagAndOldNextVersionTxtFileAndNoCommits_VersionShouldBeTag()
127128
{
128-
using (var fixture = new EmptyRepositoryFixture())
129+
using (var fixture = new EmptyRepositoryFixture(new Config()))
129130
{
130131
const string NextVersionTxt = "1.0.0";
131132
const string TaggedVersion = "1.1.0";

‎GitVersionCore.Tests/GitHubFlow/OtherBranchTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using LibGit2Sharp;
1+
using GitVersion.Configuration;
2+
using LibGit2Sharp;
23
using NUnit.Framework;
34

45
[TestFixture]
@@ -7,7 +8,7 @@ public class OtherBranchTests
78
[Test]
89
public void CanTakeVersionFromReleaseBranch()
910
{
10-
using (var fixture = new EmptyRepositoryFixture())
11+
using (var fixture = new EmptyRepositoryFixture(new Config()))
1112
{
1213
const string TaggedVersion = "1.0.3";
1314
fixture.Repository.MakeATaggedCommit(TaggedVersion);

‎GitVersionCore.Tests/GitHubFlow/ReleaseBranchTests.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using LibGit2Sharp;
1+
using GitVersion.Configuration;
2+
using LibGit2Sharp;
23
using NUnit.Framework;
34

45
[TestFixture]
@@ -7,7 +8,7 @@ public class ReleaseBranchTests
78
[Test]
89
public void CanTakeVersionFromReleaseBranch()
910
{
10-
using (var fixture = new EmptyRepositoryFixture())
11+
using (var fixture = new EmptyRepositoryFixture(new Config()))
1112
{
1213
fixture.Repository.MakeATaggedCommit("1.0.3");
1314
fixture.Repository.MakeCommits(5);
@@ -21,7 +22,7 @@ public void CanTakeVersionFromReleaseBranch()
2122
[Test]
2223
public void WhenReleaseBranchIsMergedIntoMasterVersionIsTakenWithIt()
2324
{
24-
using (var fixture = new EmptyRepositoryFixture())
25+
using (var fixture = new EmptyRepositoryFixture(new Config()))
2526
{
2627
fixture.Repository.MakeATaggedCommit("1.0.3");
2728
fixture.Repository.MakeCommits(1);
@@ -37,7 +38,7 @@ public void WhenReleaseBranchIsMergedIntoMasterVersionIsTakenWithIt()
3738
[Test]
3839
public void WhenReleaseBranchIsMergedIntoMasterHighestVersionIsTakenWithIt()
3940
{
40-
using (var fixture = new EmptyRepositoryFixture())
41+
using (var fixture = new EmptyRepositoryFixture(new Config()))
4142
{
4243
fixture.Repository.MakeATaggedCommit("1.0.3");
4344
fixture.Repository.MakeCommits(1);

‎GitVersionCore.Tests/LastVersionOnMasterFinderTests.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using GitVersion;
3+
using GitVersion.Configuration;
34
using LibGit2Sharp;
45
using NUnit.Framework;
56
using Shouldly;
@@ -11,7 +12,7 @@ public class LastVersionOnMasterFinderTests
1112
[Test]
1213
public void WhenMasterHasPatchTagEnsureLastMinorTagIsUsed()
1314
{
14-
using (var fixture = new EmptyRepositoryFixture())
15+
using (var fixture = new EmptyRepositoryFixture(new Config()))
1516
{
1617
var stamp = new DateTimeOffset(2000, 1, 1, 1, 1, 1, TimeSpan.Zero);
1718
fixture.Repository.MakeACommit(stamp);
@@ -28,7 +29,7 @@ public void WhenMasterHasPatchTagEnsureLastMinorTagIsUsed()
2829
[Test]
2930
public void WhenNoTagsOrMergeCommitsShouldUseFirstCommit()
3031
{
31-
using (var fixture = new EmptyRepositoryFixture())
32+
using (var fixture = new EmptyRepositoryFixture(new Config()))
3233
{
3334
var stamp = new DateTimeOffset(2000, 1, 1, 1, 1, 1, TimeSpan.Zero);
3435
fixture.Repository.MakeACommit(stamp);
@@ -40,7 +41,7 @@ public void WhenNoTagsOrMergeCommitsShouldUseFirstCommit()
4041
[Test]
4142
public void WhenSupportIsBranchedFromMasterEnsureLastMinorTagIsUsed()
4243
{
43-
using (var fixture = new EmptyRepositoryFixture())
44+
using (var fixture = new EmptyRepositoryFixture(new Config()))
4445
{
4546
var stamp = new DateTimeOffset(2000, 1, 1, 1, 1, 1, TimeSpan.Zero);
4647
fixture.Repository.MakeACommit(stamp);
@@ -57,7 +58,7 @@ public void WhenSupportIsBranchedFromMasterEnsureLastMinorTagIsUsed()
5758
[Test]
5859
public void WhenSupportIsBranchedAndTaggedFromAnotherSupportEnsureNewMinorIsUsed()
5960
{
60-
using (var fixture = new EmptyRepositoryFixture())
61+
using (var fixture = new EmptyRepositoryFixture(new Config()))
6162
{
6263
fixture.Repository.MakeACommit();
6364
fixture.Repository.CreateBranch("Support-1.2.0");

‎GitVersionCore/GitFlow/BranchFinders/DevelopVersionFinder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public SemanticVersion FindVersion(GitVersionContext context)
2626
Major = versionFromMaster.Major,
2727
Minor = versionFromMaster.Minor + 1,
2828
Patch = 0,
29-
PreReleaseTag = "unstable" + numberOfCommitsSinceRelease,
29+
PreReleaseTag = context.Configuration.DevelopBranchTag + numberOfCommitsSinceRelease,
3030
BuildMetaData = new SemanticVersionBuildMetaData(numberOfCommitsSinceRelease, context.CurrentBranch.Name,tip.Sha,tip.When()),
3131
};
3232

‎GitVersionExe.Tests/ExecCmdLineArgumentTest.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.IO;
2+
using GitVersion.Configuration;
23
using NUnit.Framework;
34
using Shouldly;
45

@@ -10,7 +11,7 @@ public class ExecCmdLineArgumentTest
1011
[Test]
1112
public void RunExecViaCommandLine()
1213
{
13-
using (var fixture = new EmptyRepositoryFixture())
14+
using (var fixture = new EmptyRepositoryFixture(new Config()))
1415
{
1516
fixture.Repository.MakeATaggedCommit("1.2.3");
1617
fixture.Repository.MakeACommit();
@@ -34,7 +35,7 @@ public void RunExecViaCommandLine()
3435
[Test]
3536
public void InvalidArgumentsExitCodeShouldNotBeZero()
3637
{
37-
using (var fixture = new EmptyRepositoryFixture())
38+
using (var fixture = new EmptyRepositoryFixture(new Config()))
3839
{
3940
fixture.Repository.MakeATaggedCommit("1.2.3");
4041
fixture.Repository.MakeACommit();

‎GitVersionExe.Tests/MsBuildProjectArgTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.IO;
2+
using GitVersion.Configuration;
23
using NUnit.Framework;
34
using Shouldly;
45

@@ -9,7 +10,7 @@ public class MsBuildProjectArgTest
910
public void RunsMsBuildProvideViaCommandLineArg()
1011
{
1112
const string TaggedVersion = "1.2.3";
12-
using (var fixture = new EmptyRepositoryFixture())
13+
using (var fixture = new EmptyRepositoryFixture(new Config()))
1314
{
1415
fixture.Repository.MakeATaggedCommit(TaggedVersion);
1516

‎GitVersionExe.Tests/PullRequestInTeamCityTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using GitVersion;
3+
using GitVersion.Configuration;
34
using LibGit2Sharp;
45
using NUnit.Framework;
56
using Shouldly;
@@ -12,7 +13,7 @@ public class PullRequestInTeamCityTest
1213
[TestCase("refs/pull/5/merge")]
1314
public void GivenARemoteWithATagOnMaster_AndAPullRequestWithTwoCommits_AndBuildIsRunningInTeamCity_VersionIsCalculatedProperly(string pullRequestRef)
1415
{
15-
using (var fixture = new EmptyRepositoryFixture())
16+
using (var fixture = new EmptyRepositoryFixture(new Config()))
1617
{
1718
var remoteRepositoryPath = PathHelper.GetTempPath();
1819
Repository.Init(remoteRepositoryPath);

0 commit comments

Comments
 (0)