Skip to content
This repository has been archived by the owner on Jul 12, 2022. It is now read-only.

Fix target-branch for azure devops client. #1077

Merged
merged 2 commits into from
Sep 20, 2021
Merged

Fix target-branch for azure devops client. #1077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6516641
Fix target-branch for azure devops client.
kwlin Dec 19, 2020
7415eda
Merge branch 'master' into fix-azuredevops-targetbranch
kwlin Mar 5, 2021
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
12 changes: 6 additions & 6 deletions NuKeeper.AzureDevOps/AzureDevOpsSettingsReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public override async Task<RepositorySettings> RepositorySettings(Uri repository

var settings = repositoryUri.IsFile
? await CreateSettingsFromLocal(repositoryUri, targetBranch)
: CreateSettingsFromRemote(repositoryUri);
: CreateSettingsFromRemote(repositoryUri, targetBranch);

if (settings == null)
{
Expand All @@ -59,7 +59,7 @@ public override async Task<RepositorySettings> RepositorySettings(Uri repository
return settings;
}

private static RepositorySettings CreateSettingsFromRemote(Uri repositoryUri)
private static RepositorySettings CreateSettingsFromRemote(Uri repositoryUri, string targetBranch)
{
// URL pattern is
// https://dev.azure.com/{org}/{project}/_git/{repo}/
Expand All @@ -80,17 +80,17 @@ private static RepositorySettings CreateSettingsFromRemote(Uri repositoryUri)
pathParts[0], //org
repositoryUri, //uri
Uri.UnescapeDataString(pathParts[1]), // project
Uri.UnescapeDataString(pathParts[3]) // reponame
);
Uri.UnescapeDataString(pathParts[3]), // reponame
new RemoteInfo { BranchName = targetBranch });
}
else if (indexOfGit == 1 && pathParts.Length == 3)
{
return CreateRepositorySettings(
null, //org
repositoryUri, //uri
Uri.UnescapeDataString(pathParts[0]), // project
Uri.UnescapeDataString(pathParts[2]) // reponame
);
Uri.UnescapeDataString(pathParts[2]), // reponame
new RemoteInfo { BranchName = targetBranch });
}
return null;
}
Expand Down
7 changes: 4 additions & 3 deletions Nukeeper.AzureDevOps.Tests/AzureDevOpsSettingsReaderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,27 +82,29 @@ public async Task InvalidUrlReturnsNull(string value)
[Test]
public async Task RepositorySettings_GetsCorrectSettingsOrganisation()
{
var settings = await _azureSettingsReader.RepositorySettings(new Uri("https://dev.azure.com/org/project/_git/reponame"), true);
var settings = await _azureSettingsReader.RepositorySettings(new Uri("https://dev.azure.com/org/project/_git/reponame"), true, "develop");

Assert.IsNotNull(settings);
Assert.AreEqual(settings.ApiUri, "https://dev.azure.com/org/");
Assert.AreEqual(settings.RepositoryUri, "https://dev.azure.com/org/project/_git/reponame");
Assert.AreEqual(settings.RepositoryName, "reponame");
Assert.AreEqual(settings.RepositoryOwner, "project");
Assert.AreEqual(settings.SetAutoMerge, true);
Assert.AreEqual(settings.RemoteInfo.BranchName, "develop");
}

[Test]
public async Task RepositorySettings_GetsCorrectSettingsPrivate()
{
var settings = await _azureSettingsReader.RepositorySettings(new Uri("https://dev.azure.com/owner/_git/reponame"), true);
var settings = await _azureSettingsReader.RepositorySettings(new Uri("https://dev.azure.com/owner/_git/reponame"), true, "main");

Assert.IsNotNull(settings);
Assert.AreEqual(settings.ApiUri, "https://dev.azure.com/");
Assert.AreEqual(settings.RepositoryUri, "https://dev.azure.com/owner/_git/reponame");
Assert.AreEqual(settings.RepositoryName, "reponame");
Assert.AreEqual(settings.RepositoryOwner, "owner");
Assert.AreEqual(settings.SetAutoMerge, true);
Assert.AreEqual(settings.RemoteInfo.BranchName, "main");
}

[Test]
Expand All @@ -129,6 +131,5 @@ public async Task RepositorySettings_HandlesSpacesInRepo()
Assert.AreEqual("repo name", settings.RepositoryName);
Assert.AreEqual("project name", settings.RepositoryOwner);
}

}
}