cleanup

Author: arturcic

src/GitVersion.Core.Tests/IntegrationTests/DevelopScenarios.cs

@@ -452,7 +452,7 @@ public void WhenPreventIncrementOfMergedBranchVersionIsSetToFalseForDevelopCommi
     [Test]
     public void NextVersionShouldBeConsideredOnTheMainBranch()
     {
-        using EmptyRepositoryFixture fixture = new("main");
+        using var fixture = new EmptyRepositoryFixture();
 
         var configurationBuilder = GitFlowConfigurationBuilder.New;
 
@@ -485,7 +485,7 @@ public void NextVersionShouldBeConsideredOnTheMainBranch()
     [Test]
     public void PreventDecrementationOfVersionsOnTheMainBranch()
     {
-        using EmptyRepositoryFixture fixture = new("develop");
+        using var fixture = new EmptyRepositoryFixture("develop");
 
         var configurationBuilder = GitFlowConfigurationBuilder.New;
 

src/GitVersion.Core.Tests/IntegrationTests/MainScenarios.cs

@@ -250,7 +250,7 @@ public void AreTagsNotAdheringToTagPrefixIgnored()
     [Test]
     public void NextVersionShouldBeConsideredOnTheDevelopmentBranch()
     {
-        using EmptyRepositoryFixture fixture = new("develop");
+        using var fixture = new EmptyRepositoryFixture("develop");
 
         var configurationBuilder = GitFlowConfigurationBuilder.New;
 
@@ -283,7 +283,7 @@ public void NextVersionShouldBeConsideredOnTheDevelopmentBranch()
     [Test]
     public void PreventDecrementationOfVersionsOnTheDevelopmentBranch()
     {
-        using EmptyRepositoryFixture fixture = new("develop");
+        using var fixture = new EmptyRepositoryFixture("develop");
 
         var configurationBuilder = GitFlowConfigurationBuilder.New;
 
@@ -390,7 +390,7 @@ public void PreventDecrementationOfVersionsOnTheDevelopmentBranch()
     [TestCase(false, "1.0.1-4")]
     public void TrackMergeMessageShouldBeConsideredOnTheMainBranch(bool trackMergeMessage, string expectedSemanticVersion)
     {
-        using EmptyRepositoryFixture fixture = new("main");
+        using var fixture = new EmptyRepositoryFixture();
 
         var configuration = GitFlowConfigurationBuilder.New
             .WithBranch("main", branchBuilder => branchBuilder.WithTrackMergeMessage(trackMergeMessage))

src/GitVersion.Core.Tests/IntegrationTests/OtherBranchScenarios.cs

@@ -65,7 +65,7 @@ public string WhenTaggingACommitAsPreRelease(string tagPrefix, string? label, st
             .WithBranch("main", _ => _.WithLabel(label).WithDeploymentMode(DeploymentMode.ManualDeployment))
             .Build();
 
-        using EmptyRepositoryFixture fixture = new("main");
+        using var fixture = new EmptyRepositoryFixture();
 
         fixture.MakeATaggedCommit($"{tagPrefix}1.0.0");
         fixture.MakeACommit("+semver:major");

src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs

@@ -1005,7 +1005,7 @@ public void ShouldProvideTheCorrectVersionEvenIfPreReleaseLabelExistsInTheGitTag
                 .WithIsMainBranch(false)
             ).Build();
 
-        using EmptyRepositoryFixture fixture = new("main");
+        using var fixture = new EmptyRepositoryFixture();
         fixture.MakeACommit();
 
         // ✅ succeeds as expected
@@ -1222,7 +1222,7 @@ public void EnsurePreventIncrementWhenCurrentCommitTaggedOnReleaseBranchAndIncre
     [Test]
     public void EnsureVersionAfterMainIsMergedBackToDevelopIsCorrect()
     {
-        using EmptyRepositoryFixture fixture = new("main");
+        using var fixture = new EmptyRepositoryFixture();
 
         fixture.MakeATaggedCommit("1.0.0");
         fixture.BranchTo("develop");
@@ -1256,7 +1256,7 @@ public void EnsureVersionAfterMainIsMergedBackToDevelopIsCorrectForTrunkBased(bo
             .WithVersionStrategy(VersionStrategies.TrunkBased)
             .Build();
 
-        using EmptyRepositoryFixture fixture = new("main");
+        using var fixture = new EmptyRepositoryFixture();
 
         fixture.MakeACommit("A");
         fixture.ApplyTag("1.0.0");
@@ -1282,7 +1282,7 @@ public void EnsureVersionAfterMainIsMergedBackToDevelopIsCorrectForGitFlow(bool
     {
         var configuration = GitFlowConfigurationBuilder.New.Build();
 
-        using EmptyRepositoryFixture fixture = new("main");
+        using var fixture = new EmptyRepositoryFixture();
 
         fixture.MakeACommit("A");
         fixture.ApplyTag("1.0.0");

src/GitVersion.Core.Tests/IntegrationTests/TrunkBasedDevelopmentScenarios.cs

@@ -112,7 +112,7 @@ public void VerifyPullRequestsActLikeContinuousDeliveryOnFeatureBranch()
     {
         var configuration = GetConfigurationBuilder().Build();
 
-        using EmptyRepositoryFixture fixture = new("main");
+        using var fixture = new EmptyRepositoryFixture();
 
         fixture.MakeACommit("1");
 
@@ -136,7 +136,7 @@ public void VerifyPullRequestsActLikeContinuousDeliveryOnHotfixBranch()
     {
         var configuration = GetConfigurationBuilder().Build();
 
-        using EmptyRepositoryFixture fixture = new("main");
+        using var fixture = new EmptyRepositoryFixture();
 
         fixture.MakeACommit("1");
 
@@ -155,41 +155,6 @@ public void VerifyPullRequestsActLikeContinuousDeliveryOnHotfixBranch()
         fixture.AssertFullSemver("1.0.2-PullRequest8.3", configuration);
     }
 
-    [Test, Ignore("Support of multiple tunks are not implemented at the moment.")]
-    public void SupportBranches()
-    {
-        var configuration = GetConfigurationBuilder().Build();
-
-        using var fixture = new EmptyRepositoryFixture();
-        fixture.Repository.MakeACommit("1");
-        fixture.MakeATaggedCommit("1.0.0");
-        fixture.MakeACommit(); // 1.0.1
-        fixture.MakeACommit(); // 1.0.2
-        fixture.AssertFullSemver("1.0.2", configuration);
-
-        fixture.BranchTo("support/1.0", "support10");
-        fixture.AssertFullSemver("1.0.2", configuration);
-
-        // Move main on
-        fixture.Checkout(MainBranch);
-        fixture.MakeACommit("+semver: major"); // 2.0.0 (on main)
-        fixture.AssertFullSemver("2.0.0", configuration);
-
-        // Continue on support/1.0
-        fixture.Checkout("support/1.0");
-        fixture.MakeACommit(); // 1.0.3
-        fixture.MakeACommit(); // 1.0.4
-        fixture.AssertFullSemver("1.0.4", configuration);
-        fixture.BranchTo("feature/foo", "foo");
-        fixture.AssertFullSemver("1.0.5-foo.0", configuration);
-        fixture.MakeACommit();
-        fixture.AssertFullSemver("1.0.5-foo.1", configuration);
-        fixture.MakeACommit();
-        fixture.AssertFullSemver("1.0.5-foo.2", configuration);
-        fixture.Repository.CreatePullRequestRef("feature/foo", "support/1.0", prNumber: 7, normalise: true);
-        fixture.AssertFullSemver("1.0.5-PullRequest7.3", configuration);
-    }
-
     [Test]
     public void VerifyForwardMerge()
     {
@@ -221,36 +186,6 @@ public void VerifyForwardMerge()
         fixture.AssertFullSemver("1.0.3-foo.3", configuration);
     }
 
-    [Test, Ignore("Support of multiple tunks are not implemented at the moment.")]
-    public void VerifySupportForwardMerge()
-    {
-        var configuration = GetConfigurationBuilder().Build();
-
-        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(MainBranch);
-        fixture.MakeACommit("+semver: minor");
-        fixture.AssertFullSemver("1.1.0", configuration);
-        fixture.MergeNoFF("support/1.0");
-        fixture.AssertFullSemver("1.1.1", configuration);
-        fixture.MakeACommit();
-        fixture.AssertFullSemver("1.1.2", configuration);
-        fixture.Checkout("support/1.0");
-        fixture.AssertFullSemver("1.0.3", configuration);
-
-        fixture.BranchTo("feature/foo", "foo");
-        fixture.MakeACommit();
-        fixture.MakeACommit();
-        fixture.AssertFullSemver("1.0.4-foo.2", configuration); // TODO This probably should be 1.0.5
-    }
-
     [Test]
     public void VerifyDevelopTracksMainVersion()
     {