Skip to content

refactor: update remote branch handling in tests #4522

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

Merged
merged 1 commit into from
Apr 25, 2025
Merged

refactor: update remote branch handling in tests #4522

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions src/GitVersion.Core.Tests/Extensions/GitRepositoryTestingExtensions.cs
View file
Original file line number Diff line number Diff line change
@@ -65,6 +65,21 @@ public static void DumpGraph(this IGitRepository repository, Action<string>? wri
public static void DumpGraph(this IRepository repository, Action<string>? writer = null, int? maxCommits = null)
=> DumpGraph(repository.ToGitRepository().Path, writer, maxCommits);

public static void RenameRemote(this LibGit2Sharp.RemoteCollection remotes, string oldName, string newName)
{
if (oldName.IsEquivalentTo(newName)) return;
if (remotes.Any(remote => remote.Name == newName))
{
throw new InvalidOperationException($"A remote with the name '{newName}' already exists.");
}
if (!remotes.Any(remote => remote.Name == oldName))
{
throw new InvalidOperationException($"A remote with the name '{oldName}' does not exist.");
}
remotes.Add(newName, remotes[oldName].Url);
remotes.Remove(oldName);
}

public static GitVersionVariables GetVersion(this RepositoryFixtureBase fixture, IGitVersionConfiguration? configuration = null,
IRepository? repository = null, string? commitId = null, bool onlyTrackedBranches = true, string? targetBranch = null)
{
7 changes: 1 addition & 6 deletions src/GitVersion.Core.Tests/IntegrationTests/RemoteRepositoryScenarios.cs
View file
Original file line number Diff line number Diff line change
@@ -142,17 +142,12 @@ private static void CopyRemoteBranchesToHeads(Repository repository)
[TestCase("custom", "release/3.0.0", "0.1.0-alpha.5")]
public void EnsureRemoteReleaseBranchesAreTracked(string origin, string branchName, string expectedVersion)
{
if (SysEnv.OSVersion.Platform == PlatformID.Win32NT)
{
Assert.Ignore("Test ignored on Windows - LibGitSharp 0.31.0 fails");
}

using var fixture = new RemoteRepositoryFixture("develop");

fixture.CreateBranch(branchName);
fixture.MakeACommit();

if (origin != "origin") fixture.LocalRepositoryFixture.Repository.Network.Remotes.Rename("origin", origin);
if (origin != "origin") fixture.LocalRepositoryFixture.Repository.Network.Remotes.RenameRemote("origin", origin);
fixture.LocalRepositoryFixture.Fetch(origin);
fixture.LocalRepositoryFixture.Checkout("develop");

6 changes: 1 addition & 5 deletions src/GitVersion.Core.Tests/IntegrationTests/VersionInCurrentBranchNameScenarios.cs
View file
Original file line number Diff line number Diff line change
@@ -54,12 +54,8 @@ public void TakesVersionFromNameOfRemoteReleaseBranchInOrigin()
[Test]
public void DoesNotTakeVersionFromNameOfRemoteReleaseBranchInCustomRemote()
{
if (SysEnv.OSVersion.Platform == PlatformID.Win32NT)
{
Assert.Ignore("Test ignored on Windows - LibGitSharp 0.31.0 fails");
}
using var fixture = new RemoteRepositoryFixture();
fixture.LocalRepositoryFixture.Repository.Network.Remotes.Rename("origin", "upstream");
fixture.LocalRepositoryFixture.Repository.Network.Remotes.RenameRemote("origin", "upstream");
fixture.BranchTo("release/2.0.0");
fixture.MakeACommit();
Commands.Fetch(fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, [], new(), null);
6 changes: 1 addition & 5 deletions src/GitVersion.Core.Tests/IntegrationTests/VersionInMergedBranchNameScenarios.cs
View file
Original file line number Diff line number Diff line change
@@ -70,12 +70,8 @@ public void TakesVersionFromNameOfRemoteReleaseBranchInOrigin()
[Test]
public void DoesNotTakeVersionFromNameOfRemoteReleaseBranchInCustomRemote()
{
if (SysEnv.OSVersion.Platform == PlatformID.Win32NT)
{
Assert.Ignore("Test ignored on Windows - LibGitSharp 0.31.0 fails");
}
using var fixture = new RemoteRepositoryFixture();
fixture.LocalRepositoryFixture.Repository.Network.Remotes.Rename("origin", "upstream");
fixture.LocalRepositoryFixture.Repository.Network.Remotes.RenameRemote("origin", "upstream");
fixture.BranchTo("release/2.0.0");
fixture.MakeACommit();
fixture.LocalRepositoryFixture.Fetch("upstream");
6 changes: 1 addition & 5 deletions ...n.Core.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs
View file
Original file line number Diff line number Diff line change
@@ -98,14 +98,10 @@ public void CanTakeVersionFromNameOfConfiguredReleaseBranch(string branchName, s
[TestCase("origin", "release/3.0.0", "3.0.0")]
public void CanTakeVersionFromNameOfRemoteReleaseBranch(string origin, string branchName, string expectedBaseVersion)
{
if (SysEnv.OSVersion.Platform == PlatformID.Win32NT)
{
Assert.Ignore("Test ignored on Windows - LibGitSharp 0.31.0 fails");
}
using var fixture = new RemoteRepositoryFixture();

fixture.CreateBranch(branchName);
if (origin != "origin") fixture.LocalRepositoryFixture.Repository.Network.Remotes.Rename("origin", origin);
if (origin != "origin") fixture.LocalRepositoryFixture.Repository.Network.Remotes.RenameRemote("origin", origin);
fixture.LocalRepositoryFixture.Fetch(origin);

var localRepository = fixture.LocalRepositoryFixture.Repository.ToGitRepository();