Skip to content

Commit ec5d880

Browse files
committed
integration test ignoring of versions from branch names in custom remotes
1 parent c515c25 commit ec5d880

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

src/GitVersionCore.Tests/IntegrationTests/VersionInMergedBranchNameScenarios.cs

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void TakesVersionFromNameOfBranchThatIsReleaseByConfig()
5656
}
5757

5858
[Test]
59-
public void TakesVersionFromNameOfRemoteReleaseBranch()
59+
public void TakesVersionFromNameOfRemoteReleaseBranchInOrigin()
6060
{
6161
using (var fixture = new RemoteRepositoryFixture())
6262
{
@@ -69,6 +69,22 @@ public void TakesVersionFromNameOfRemoteReleaseBranch()
6969
fixture.LocalRepositoryFixture.AssertFullSemver("2.0.0+0");
7070
}
7171
}
72+
73+
[Test]
74+
public void DoesNotTakeVersionFromNameOfRemoteReleaseBranchInCustomRemote()
75+
{
76+
using (var fixture = new RemoteRepositoryFixture())
77+
{
78+
fixture.LocalRepositoryFixture.Repository.Network.Remotes.Rename("origin", "upstream");
79+
fixture.BranchTo("release/2.0.0");
80+
fixture.MakeACommit();
81+
Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, new string[0], new FetchOptions(), null);
82+
83+
fixture.LocalRepositoryFixture.MergeNoFF("upstream/release/2.0.0");
84+
85+
fixture.LocalRepositoryFixture.AssertFullSemver("0.1.0+6");
86+
}
87+
}
7288
}
7389

7490
internal static class BaseGitFlowRepositoryFixtureExtensions

0 commit comments

Comments
 (0)