Skip to content

Commit 7af3377

Browse files
JakeGinnivanJakeGinnivan
committed
Merge pull request #355 from JakeGinnivan/FixingTests
Fixing tests
2 parents 349dce8 + 2c2019f commit 7af3377

29 files changed

+320
-135
lines changed

‎GitVersionCore.Tests/GitVersionCore.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
<Compile Include="GitDirFinderTests.cs" />
7878
<Compile Include="Fixtures\BaseGitFlowRepositoryFixture.cs" />
7979
<Compile Include="GitVersionContextTests.cs" />
80+
<Compile Include="IntegrationTests\PullRequestScenarios.cs" />
8081
<Compile Include="IntegrationTests\RemoteRepositoryTests.cs" />
8182
<Compile Include="IntegrationTests\GitFlow\DevelopScenarios.cs" />
8283
<Compile Include="IntegrationTests\GitFlow\GitFlowFeatureBranchTests.cs" />

‎GitVersionCore.Tests/IntegrationTests/GitFlow/DevelopScenarios.cs

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,77 +12,78 @@ public void WhenDevelopBranchedFromTaggedCommitOnMasterVersionDoesNotChange()
1212
{
1313
fixture.Repository.MakeATaggedCommit("1.0.0");
1414
fixture.Repository.CreateBranch("develop").Checkout();
15-
// TODO Should actually be 1.0.0+0
16-
fixture.AssertFullSemver("1.1.0-unstable.0+0");
15+
fixture.AssertFullSemver("1.0.0+0");
1716
}
1817
}
1918

2019
[Test]
21-
public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
20+
public void CanChangeDevelopTagViaConfig()
2221
{
23-
using (var fixture = new EmptyRepositoryFixture(new Config()))
22+
var config = new Config();
23+
config.Branches["develop"].Tag = "alpha";
24+
using (var fixture = new EmptyRepositoryFixture(config))
2425
{
2526
fixture.Repository.MakeATaggedCommit("1.0.0");
2627
fixture.Repository.CreateBranch("develop").Checkout();
2728
fixture.Repository.MakeACommit();
28-
fixture.AssertFullSemver("1.1.0-unstable.1+1");
29+
fixture.AssertFullSemver("1.1.0-alpha.1+1");
2930
}
3031
}
3132

3233
[Test]
33-
public void MergingReleaseBranchBackIntoDevelopWithoutMergingToMaster_DoesNotBumpDevelopVersion()
34+
public void CanClearDevelopTagViaConfig()
3435
{
35-
using (var fixture = new EmptyRepositoryFixture(new Config()))
36+
var config = new Config();
37+
config.Branches["develop"].Tag = "";
38+
using (var fixture = new EmptyRepositoryFixture(config))
3639
{
3740
fixture.Repository.MakeATaggedCommit("1.0.0");
3841
fixture.Repository.CreateBranch("develop").Checkout();
3942
fixture.Repository.MakeACommit();
40-
fixture.Repository.CreateBranch("release-2.0.0").Checkout();
41-
fixture.AssertFullSemver("2.0.0-beta.1+0");
42-
fixture.Repository.Checkout("develop");
43-
fixture.AssertFullSemver("1.1.0-unstable.1+1");
44-
fixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow());
45-
fixture.AssertFullSemver("1.1.0-unstable.1+1");
43+
fixture.AssertFullSemver("1.1.0+1");
4644
}
4745
}
48-
46+
4947
[Test]
50-
public void CanChangeDevelopTagViaConfig()
48+
public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
5149
{
52-
var config = new Config();
53-
config.Branches["develop"].Tag = "alpha";
54-
using (var fixture = new EmptyRepositoryFixture(config))
50+
using (var fixture = new EmptyRepositoryFixture(new Config()))
5551
{
5652
fixture.Repository.MakeATaggedCommit("1.0.0");
5753
fixture.Repository.CreateBranch("develop").Checkout();
58-
fixture.AssertFullSemver("1.1.0-alpha.0+0");
54+
fixture.Repository.MakeACommit();
55+
fixture.AssertFullSemver("1.1.0-unstable.1+1");
5956
}
6057
}
6158

6259
[Test]
63-
public void CanHandleContinuousDelivery()
60+
public void MergingReleaseBranchBackIntoDevelopWithoutMergingToMaster_DoesNotBumpDevelopVersion()
6461
{
65-
var config = new Config();
66-
config.Branches["develop"].VersioningMode = VersioningMode.ContinuousDelivery;
67-
using (var fixture = new EmptyRepositoryFixture(config))
62+
using (var fixture = new EmptyRepositoryFixture(new Config()))
6863
{
6964
fixture.Repository.MakeATaggedCommit("1.0.0");
7065
fixture.Repository.CreateBranch("develop").Checkout();
71-
fixture.Repository.MakeATaggedCommit("1.1.0-alpha7");
72-
fixture.AssertFullSemver("1.1.0-alpha.7+1");
66+
fixture.Repository.MakeACommit();
67+
fixture.Repository.CreateBranch("release-2.0.0").Checkout();
68+
fixture.AssertFullSemver("2.0.0-beta.1+0");
69+
fixture.Repository.Checkout("develop");
70+
fixture.AssertFullSemver("1.1.0-unstable.1+1");
71+
fixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow());
72+
fixture.AssertFullSemver("1.1.0-unstable.1+1");
7373
}
7474
}
75-
75+
7676
[Test]
77-
public void CanClearDevelopTagViaConfig()
77+
public void CanHandleContinuousDelivery()
7878
{
7979
var config = new Config();
80-
config.Branches["develop"].Tag = "";
80+
config.Branches["develop"].VersioningMode = VersioningMode.ContinuousDelivery;
8181
using (var fixture = new EmptyRepositoryFixture(config))
8282
{
8383
fixture.Repository.MakeATaggedCommit("1.0.0");
8484
fixture.Repository.CreateBranch("develop").Checkout();
85-
fixture.AssertFullSemver("1.1.0+0");
85+
fixture.Repository.MakeATaggedCommit("1.1.0-alpha7");
86+
fixture.AssertFullSemver("1.1.0-alpha.7+0");
8687
}
8788
}
8889

‎GitVersionCore.Tests/IntegrationTests/GitFlow/GitFlowFeatureBranchTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public void ShouldNotUseNumberInFeatureBranchAsPreReleaseNumber()
1717
fixture.Repository.Checkout("feature/JIRA-123");
1818
fixture.Repository.MakeCommits(5);
1919

20-
fixture.AssertFullSemver("1.1.0-JIRA-123+5");
20+
fixture.AssertFullSemver("1.1.0-JIRA-123.1+5");
2121
}
2222
}
2323
}

‎GitVersionCore.Tests/IntegrationTests/GitFlow/PatchScenarios.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ public void PatchLatestReleaseExample()
1313
// create hotfix
1414
fixture.Repository.CreateBranch("hotfix-1.2.1").Checkout();
1515

16-
fixture.AssertFullSemver("1.2.1-beta.1+1");
16+
fixture.AssertFullSemver("1.2.1-beta.1+0");
1717
fixture.Repository.MakeACommit();
18-
fixture.AssertFullSemver("1.2.1-beta.1+2");
18+
fixture.AssertFullSemver("1.2.1-beta.1+1");
1919
fixture.Repository.ApplyTag("1.2.1-beta.1");
20-
fixture.AssertFullSemver("1.2.1-beta.1+2");
20+
fixture.AssertFullSemver("1.2.1-beta.1+0");
2121
fixture.Repository.MakeACommit();
22-
fixture.AssertFullSemver("1.2.1-beta.2+3");
22+
fixture.AssertFullSemver("1.2.1-beta.2+1");
2323

2424
// Merge hotfix branch to master
2525
fixture.Repository.Checkout("master");

‎GitVersionCore.Tests/IntegrationTests/GitFlow/ReleaseBranchTests.cs

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ public void CanTakeVersionFromReleaseBranch()
1616
fixture.Repository.CreateBranch("release-2.0.0");
1717
fixture.Repository.Checkout("release-2.0.0");
1818

19-
fixture.AssertFullSemver("2.0.0-beta.1+5");
19+
fixture.AssertFullSemver("2.0.0-beta.1+0");
20+
fixture.Repository.MakeCommits(2);
21+
fixture.AssertFullSemver("2.0.0-beta.1+2");
2022
}
2123
}
2224

@@ -33,26 +35,9 @@ public void CanTakeVersionFromReleaseBranchWithTagOverriden()
3335
fixture.Repository.CreateBranch("release-2.0.0");
3436
fixture.Repository.Checkout("release-2.0.0");
3537

36-
fixture.AssertFullSemver("2.0.0-rc.1+5");
37-
}
38-
}
39-
40-
[Test]
41-
public void CanHandleContinuousDeployment()
42-
{
43-
var config = new Config
44-
{
45-
VersioningMode = VersioningMode.ContinuousDeployment
46-
};
47-
using (var fixture = new EmptyRepositoryFixture(config))
48-
{
49-
fixture.Repository.MakeATaggedCommit("1.0.3");
50-
fixture.Repository.CreateBranch("develop");
51-
fixture.Repository.MakeCommits(5);
52-
fixture.Repository.CreateBranch("release-2.0.0");
53-
fixture.Repository.Checkout("release-2.0.0");
54-
55-
fixture.AssertFullSemver("2.0.0-beta.5+5");
38+
fixture.AssertFullSemver("2.0.0-rc.1+0");
39+
fixture.Repository.MakeCommits(2);
40+
fixture.AssertFullSemver("2.0.0-rc.1+2");
5641
}
5742
}
5843

@@ -67,7 +52,9 @@ public void CanHandleReleaseBranchWithStability()
6752
fixture.Repository.CreateBranch("release-2.0.0-Final");
6853
fixture.Repository.Checkout("release-2.0.0-Final");
6954

70-
fixture.AssertFullSemver("2.0.0-beta.1+5");
55+
fixture.AssertFullSemver("2.0.0-beta.1+0");
56+
fixture.Repository.MakeCommits(2);
57+
fixture.AssertFullSemver("2.0.0-beta.1+2");
7158
}
7259
}
7360

@@ -85,13 +72,13 @@ public void WhenReleaseBranchIsMergedIntoMasterVersionIsTakenWithIt()
8572
fixture.Repository.Checkout("master");
8673
fixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow());
8774

88-
// TODO For GitHubFlow this is 2.0.0+6, why is it different
89-
fixture.AssertFullSemver("2.0.0");
75+
fixture.AssertFullSemver("2.0.0+0");
76+
fixture.Repository.MakeCommits(2);
77+
fixture.AssertFullSemver("2.0.0+2");
9078
}
9179
}
9280

93-
// TODO This test fails for GitFlow, it needs to be fixed (although in reality a support branch should be used)
94-
[Test, Ignore]
81+
[Test]
9582
public void WhenReleaseBranchIsMergedIntoMasterHighestVersionIsTakenWithIt()
9683
{
9784
using (var fixture = new EmptyRepositoryFixture(new Config()))
@@ -116,7 +103,7 @@ public void WhenReleaseBranchIsMergedIntoMasterHighestVersionIsTakenWithIt()
116103
fixture.Repository.Checkout("develop");
117104
fixture.Repository.MergeNoFF("release-1.0.0", Constants.SignatureNow());
118105

119-
fixture.AssertFullSemver("2.0.0+11");
106+
fixture.AssertFullSemver("2.0.0-unstable.1+5");
120107
}
121108
}
122109
}

‎GitVersionCore.Tests/IntegrationTests/GitFlow/SwitchingToGitFlowScenarios.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public void WhenDevelopBranchedFromMasterWithLegacyVersionTags_DevelopCanUseReac
1414
fixture.Repository.MakeATaggedCommit("1.0.0.0");
1515
fixture.Repository.MakeCommits(2);
1616
fixture.Repository.CreateBranch("develop").Checkout();
17-
fixture.AssertFullSemver("1.1.0-unstable.0+0");
17+
fixture.AssertFullSemver("1.1.0-unstable.1+2");
1818
}
1919
}
2020
}

‎GitVersionCore.Tests/IntegrationTests/GitFlow/UncycloScenarios.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ public void MinorReleaseExample()
4444

4545
// Branch to develop
4646
fixture.Repository.CreateBranch("develop").Checkout();
47-
fixture.AssertFullSemver("1.3.0-unstable.0+0");
47+
fixture.Repository.MakeACommit();
48+
fixture.AssertFullSemver("1.3.0-unstable.1+1");
4849

4950
// Open Pull Request
5051
fixture.Repository.CreateBranch("pull/2/merge").Checkout();

‎GitVersionCore.Tests/IntegrationTests/GitHubFlow/GitHubFlowFeatureBranchTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public void ShouldNotUseNumberInFeatureBranchAsPreReleaseNumber()
1515
fixture.Repository.Checkout("feature/JIRA-123");
1616
fixture.Repository.MakeCommits(5);
1717

18-
fixture.AssertFullSemver("1.0.1-JIRA-123+5");
18+
fixture.AssertFullSemver("1.0.1-JIRA-123.1+5");
1919
}
2020
}
2121

@@ -29,7 +29,7 @@ public void TestFeatureBranch()
2929
fixture.Repository.Checkout("feature-test");
3030
fixture.Repository.MakeCommits(5);
3131

32-
fixture.AssertFullSemver("1.0.1-feature-test+5");
32+
fixture.AssertFullSemver("1.0.1-test.1+5");
3333
}
3434
}
3535
}

‎GitVersionCore.Tests/IntegrationTests/GitHubFlow/GitHubFlowSupportBranchScenarios.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@ public void SupportIsCalculatedCorrectly()
3737
// Create 1.2.0 release
3838
fixture.Repository.Checkout("support/1.0.0");
3939
fixture.Repository.MergeNoFF("release/1.2.0");
40-
fixture.AssertFullSemver("1.2.0+2");
40+
fixture.AssertFullSemver("1.2.0+0");
4141
fixture.Repository.ApplyTag("1.2.0");
4242

4343
// Create 1.2.1 hotfix
4444
fixture.Repository.CreateBranch("hotfix/1.2.1").Checkout();
4545
fixture.Repository.MakeACommit();
46-
fixture.AssertFullSemver("1.2.1+1");
46+
fixture.AssertFullSemver("1.2.1-beta.1+1");
4747
fixture.Repository.Checkout("support/1.0.0");
4848
fixture.Repository.MergeNoFF("hotfix/1.2.1");
49-
fixture.AssertFullSemver("1.2.1+2");
49+
fixture.AssertFullSemver("1.2.1+0");
5050
}
5151
}
5252

@@ -69,7 +69,7 @@ public void WhenSupportIsBranchedAndTaggedFromAnotherSupportEnsureNewMinorIsUsed
6969
fixture.Repository.MakeACommit();
7070
fixture.Repository.MakeACommit();
7171

72-
fixture.AssertFullSemver("1.3.1+2");
72+
fixture.AssertFullSemver("1.3.1+0");
7373
}
7474
}
7575
}

‎GitVersionCore.Tests/IntegrationTests/GitHubFlow/ReleaseBranchTests.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ public void CanTakeVersionFromReleaseBranch()
1515
fixture.Repository.CreateBranch("release-2.0.0");
1616
fixture.Repository.Checkout("release-2.0.0");
1717

18-
fixture.AssertFullSemver("2.0.0-beta.1+5");
18+
fixture.AssertFullSemver("2.0.0-beta.1+0");
19+
fixture.Repository.MakeCommits(2);
20+
fixture.AssertFullSemver("2.0.0-beta.1+2");
1921
}
2022
}
2123

@@ -31,7 +33,9 @@ public void CanTakeVersionFromReleaseBranchWithTagOverriden()
3133
fixture.Repository.CreateBranch("release-2.0.0");
3234
fixture.Repository.Checkout("release-2.0.0");
3335

34-
fixture.AssertFullSemver("2.0.0-rc.1+5");
36+
fixture.AssertFullSemver("2.0.0-rc.1+0");
37+
fixture.Repository.MakeCommits(2);
38+
fixture.AssertFullSemver("2.0.0-rc.1+2");
3539
}
3640
}
3741

@@ -48,7 +52,7 @@ public void WhenReleaseBranchIsMergedIntoMasterVersionIsTakenWithIt()
4852
fixture.Repository.Checkout("master");
4953
fixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow());
5054

51-
fixture.AssertFullSemver("2.0.0+6");
55+
fixture.AssertFullSemver("2.0.0+0");
5256
}
5357
}
5458
[Test]
@@ -71,7 +75,7 @@ public void WhenReleaseBranchIsMergedIntoMasterHighestVersionIsTakenWithIt()
7175
fixture.Repository.Checkout("master");
7276
fixture.Repository.MergeNoFF("release-1.0.0", Constants.SignatureNow());
7377

74-
fixture.AssertFullSemver("2.0.0+11");
78+
fixture.AssertFullSemver("2.0.0+5");
7579
}
7680
}
7781

0 commit comments

Comments
 (0)