diff --git a/src/GitHub.App/Services/RepositoryCloneService.cs b/src/GitHub.App/Services/RepositoryCloneService.cs index 86177cda7d..72e46226d0 100644 --- a/src/GitHub.App/Services/RepositoryCloneService.cs +++ b/src/GitHub.App/Services/RepositoryCloneService.cs @@ -11,6 +11,7 @@ using GitHub.Logging; using GitHub.Models; using GitHub.Primitives; +using GitHub.Settings; using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Threading; using Octokit.GraphQL; @@ -39,6 +40,7 @@ public class RepositoryCloneService : IRepositoryCloneService readonly IGraphQLClientFactory graphqlFactory; readonly IGitHubContextService gitHubContextService; readonly IUsageTracker usageTracker; + readonly Lazy packageSettings; readonly Lazy dte; ICompiledQuery readViewerRepositories; @@ -51,6 +53,7 @@ public RepositoryCloneService( IGitHubContextService gitHubContextService, IUsageTracker usageTracker, IGitHubServiceProvider sp, + Lazy packageSettings, [Import(AllowDefault = true)] JoinableTaskContext joinableTaskContext) { this.operatingSystem = operatingSystem; @@ -59,10 +62,9 @@ public RepositoryCloneService( this.graphqlFactory = graphqlFactory; this.gitHubContextService = gitHubContextService; this.usageTracker = usageTracker; + this.packageSettings = packageSettings; dte = new Lazy(() => sp.GetService()); JoinableTaskContext = joinableTaskContext ?? ThreadHelper.JoinableTaskContext; - - defaultClonePath = GetLocalClonePathFromGitProvider(operatingSystem.Environment.GetUserRepositoriesPath()); } /// @@ -225,6 +227,8 @@ public async Task CloneRepository( // Count the number of times users clone into the Default Repository Location await usageTracker.IncrementCounter(x => x.NumberOfClonesToDefaultClonePath); } + + SetDefaultClonePath(repositoryPath, cloneUrl); } catch (Exception ex) { @@ -251,13 +255,38 @@ string GetLocalClonePathFromGitProvider(string fallbackPath) : fallbackPath; } - public string DefaultClonePath { get { return defaultClonePath; } } + public void SetDefaultClonePath(string repositoryPath, UriString cloneUrl) + { + var (defaultPath, repositoryLayout) = RepositoryLayoutUtilities.GetDefaultPathAndLayout(repositoryPath, cloneUrl); - JoinableTaskContext JoinableTaskContext { get; } + log.Information("Setting DefaultRepositoryLocation to {Location}", defaultPath); + packageSettings.Value.DefaultRepositoryLocation = defaultPath; + + log.Information("Setting DefaultRepositoryLayout to {Layout}", repositoryLayout); + packageSettings.Value.DefaultRepositoryLayout = repositoryLayout.ToString(); - class OrganizationAdapter + packageSettings.Value.Save(); + } + + public RepositoryLayout DefaultRepositoryLayout { - public IReadOnlyList Repositories { get; set; } + get => RepositoryLayoutUtilities.GetRepositoryLayout(packageSettings.Value.DefaultRepositoryLayout); } + + public string DefaultClonePath + { + get + { + var defaultPath = packageSettings.Value.DefaultRepositoryLocation; + if (!string.IsNullOrEmpty(defaultPath)) + { + return defaultPath; + } + + return GetLocalClonePathFromGitProvider(operatingSystem.Environment.GetUserRepositoriesPath()); + } + } + + JoinableTaskContext JoinableTaskContext { get; } } } diff --git a/src/GitHub.App/Services/RepositoryLayoutUtilities.cs b/src/GitHub.App/Services/RepositoryLayoutUtilities.cs new file mode 100644 index 0000000000..b66b562da1 --- /dev/null +++ b/src/GitHub.App/Services/RepositoryLayoutUtilities.cs @@ -0,0 +1,49 @@ +using System; +using System.IO; +using GitHub.Primitives; + +namespace GitHub.Services +{ + public static class RepositoryLayoutUtilities + { + // Exclude directories with a case sensitive name of "GitHub" from being a possible owner. + // GitHub Desktop uses "GitHub" as its default directory and this isn't a user or organization name. + const string GitHubDirectoryName = "GitHub"; + + public static string GetDefaultRepositoryPath(UriString cloneUrl, string defaultPath, RepositoryLayout repositoryLayout) + { + switch (repositoryLayout) + { + case RepositoryLayout.Name: + return Path.Combine(defaultPath, cloneUrl.RepositoryName); + case RepositoryLayout.Default: + case RepositoryLayout.OwnerName: + return Path.Combine(defaultPath, cloneUrl.Owner, cloneUrl.RepositoryName); + default: + throw new ArgumentException($"Unknown repository layout: {repositoryLayout}"); + + } + } + + public static RepositoryLayout GetRepositoryLayout(string repositoryLayoutSetting) + { + return Enum.TryParse(repositoryLayoutSetting, out RepositoryLayout repositoryLayout) ? + repositoryLayout : RepositoryLayout.Default; + } + + public static (string, RepositoryLayout) GetDefaultPathAndLayout(string repositoryPath, UriString cloneUrl) + { + var possibleOwnerPath = Path.GetDirectoryName(repositoryPath); + var possibleOwner = Path.GetFileName(possibleOwnerPath); + if (string.Equals(possibleOwner, cloneUrl.Owner, StringComparison.OrdinalIgnoreCase) && + !string.Equals(possibleOwner, GitHubDirectoryName, StringComparison.Ordinal)) + { + return (Path.GetDirectoryName(possibleOwnerPath), RepositoryLayout.OwnerName); + } + else + { + return (possibleOwnerPath, RepositoryLayout.Name); + } + } + } +} diff --git a/src/GitHub.App/ViewModels/Dialog/Clone/RepositoryCloneViewModel.cs b/src/GitHub.App/ViewModels/Dialog/Clone/RepositoryCloneViewModel.cs index 1971914a4f..ed54a2b1c0 100644 --- a/src/GitHub.App/ViewModels/Dialog/Clone/RepositoryCloneViewModel.cs +++ b/src/GitHub.App/ViewModels/Dialog/Clone/RepositoryCloneViewModel.cs @@ -210,55 +210,27 @@ void UpdatePath(RepositoryModel repository) { if (repository != null) { - var basePath = GetUpdatedBasePath(Path); - previousRepository = repository; - Path = System.IO.Path.Combine(basePath, repository.Owner, repository.Name); - } - } - - string GetUpdatedBasePath(string path) - { - if (string.IsNullOrEmpty(path)) - { - return service.DefaultClonePath; - } - - if (previousRepository == null) - { - return path; - } - - if (FindDirWithout(path, previousRepository?.Owner, 2) is string dirWithoutOwner) - { - return dirWithoutOwner; - } - - if (FindDirWithout(path, previousRepository?.Name, 1) is string dirWithoutRepo) - { - return dirWithoutRepo; - } - - return path; - - string FindDirWithout(string dir, string match, int levels) - { - string dirWithout = null; - for (var i = 0; i < 2; i++) + try { - if (string.IsNullOrEmpty(dir)) + if (previousRepository != null && !string.IsNullOrEmpty(Path)) { - break; + var (path, layout) = RepositoryLayoutUtilities.GetDefaultPathAndLayout(Path, previousRepository.CloneUrl); + Path = RepositoryLayoutUtilities.GetDefaultRepositoryPath(repository.CloneUrl, path, layout); } - - var name = System.IO.Path.GetFileName(dir); - dir = System.IO.Path.GetDirectoryName(dir); - if (name == match) + else { - dirWithout = dir; + Path = RepositoryLayoutUtilities.GetDefaultRepositoryPath(repository.CloneUrl, + service.DefaultClonePath, service.DefaultRepositoryLayout); } } + catch (Exception) + { + // Reset illegal paths + Path = RepositoryLayoutUtilities.GetDefaultRepositoryPath(repository.CloneUrl, + service.DefaultClonePath, service.DefaultRepositoryLayout); + } - return dirWithout; + previousRepository = repository; } } diff --git a/src/GitHub.Exports.Reactive/Services/IRepositoryCloneService.cs b/src/GitHub.Exports.Reactive/Services/IRepositoryCloneService.cs index 791aa25734..d8df1d8b9d 100644 --- a/src/GitHub.Exports.Reactive/Services/IRepositoryCloneService.cs +++ b/src/GitHub.Exports.Reactive/Services/IRepositoryCloneService.cs @@ -11,11 +11,20 @@ namespace GitHub.Services public interface IRepositoryCloneService { /// - /// Default path to clone things to, used as fallback if we can't find the correct path - /// from VS. + /// Default path to clone things to /// string DefaultClonePath { get; } + /// + /// Default layout of repository directories. + /// + RepositoryLayout DefaultRepositoryLayout { get; } + + /// + /// Infer the default clone path and layout from an example repository path and clone URL. + /// + void SetDefaultClonePath(string repositoryPath, UriString cloneUrl); + /// /// Clones the specificed repository into the specified directory. /// diff --git a/src/GitHub.Exports.Reactive/Services/RepositoryLayout.cs b/src/GitHub.Exports.Reactive/Services/RepositoryLayout.cs new file mode 100644 index 0000000000..aa32bad77a --- /dev/null +++ b/src/GitHub.Exports.Reactive/Services/RepositoryLayout.cs @@ -0,0 +1,9 @@ +namespace GitHub.Services +{ + public enum RepositoryLayout + { + Default, // Layout hasn't been specified + Name, // Layout repositories by name + OwnerName // Layout repositories by owner and name + } +} diff --git a/src/GitHub.Exports/Settings/generated/IPackageSettings.cs b/src/GitHub.Exports/Settings/generated/IPackageSettings.cs index 81e7309778..e491f92a0f 100644 --- a/src/GitHub.Exports/Settings/generated/IPackageSettings.cs +++ b/src/GitHub.Exports/Settings/generated/IPackageSettings.cs @@ -38,5 +38,7 @@ public interface IPackageSettings : INotifyPropertyChanged UIState UIState { get; set; } bool HideTeamExplorerWelcomeMessage { get; set; } bool EnableTraceLogging { get; set; } + string DefaultRepositoryLocation { get; set; } + string DefaultRepositoryLayout { get; set; } } } \ No newline at end of file diff --git a/src/GitHub.VisualStudio/Settings/generated/PackageSettingsGen.cs b/src/GitHub.VisualStudio/Settings/generated/PackageSettingsGen.cs index e9ccc3dd62..ed3cb24124 100644 --- a/src/GitHub.VisualStudio/Settings/generated/PackageSettingsGen.cs +++ b/src/GitHub.VisualStudio/Settings/generated/PackageSettingsGen.cs @@ -5,7 +5,7 @@ { "name": "CollectMetrics", "type": "bool", - "default": 'true' + "default": "true" }, { "name": "UIState", @@ -22,6 +22,16 @@ "name": "EnableTraceLogging", "type": "bool", "default": "false" + }, + { + "name": "DefaultRepositoryLocation", + "type": "string", + "default": "null" + }, + { + "name": "DefaultRepositoryLayout", + "type": "string", + "default": "null" } ] } @@ -71,6 +81,20 @@ public bool EnableTraceLogging set { enableTraceLogging = value; this.RaisePropertyChange(); } } + string defaultRepositoryLocation; + public string DefaultRepositoryLocation + { + get { return defaultRepositoryLocation; } + set { defaultRepositoryLocation = value; this.RaisePropertyChange(); } + } + + string defaultRepositoryLayout; + public string DefaultRepositoryLayout + { + get { return defaultRepositoryLayout; } + set { defaultRepositoryLayout = value; this.RaisePropertyChange(); } + } + void LoadSettings() { @@ -78,6 +102,8 @@ void LoadSettings() UIState = SimpleJson.DeserializeObject((string)settingsStore.Read("UIState", "{}")); HideTeamExplorerWelcomeMessage = (bool)settingsStore.Read("HideTeamExplorerWelcomeMessage", false); EnableTraceLogging = (bool)settingsStore.Read("EnableTraceLogging", false); + DefaultRepositoryLocation = (string)settingsStore.Read("DefaultRepositoryLocation", null); + DefaultRepositoryLayout = (string)settingsStore.Read("DefaultRepositoryLayout", null); } void SaveSettings() @@ -86,6 +112,8 @@ void SaveSettings() settingsStore.Write("UIState", SimpleJson.SerializeObject(UIState)); settingsStore.Write("HideTeamExplorerWelcomeMessage", HideTeamExplorerWelcomeMessage); settingsStore.Write("EnableTraceLogging", EnableTraceLogging); + settingsStore.Write("DefaultRepositoryLocation", DefaultRepositoryLocation); + settingsStore.Write("DefaultRepositoryLayout", DefaultRepositoryLayout); } } diff --git a/src/GitHub.VisualStudio/Settings/generated/PackageSettingsGen.tt b/src/GitHub.VisualStudio/Settings/generated/PackageSettingsGen.tt index a575552ca8..7e7f5b8cb0 100644 --- a/src/GitHub.VisualStudio/Settings/generated/PackageSettingsGen.tt +++ b/src/GitHub.VisualStudio/Settings/generated/PackageSettingsGen.tt @@ -3,7 +3,7 @@ <#@ import namespace="System.Linq" #> <#@ import namespace="System.Collections.Generic" #> <#@ import namespace="System.IO" #> -<#@ assembly name="$(PackageDir)\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll" #> +<#@ assembly name="$(USERPROFILE)\.nuget\packages\Newtonsoft.Json\6.0.8\lib\net45\Newtonsoft.Json.dll" #> <#@ import namespace="Newtonsoft.Json.Linq" #> <#@ output extension=".cs" #> <# diff --git a/src/common/settings.json b/src/common/settings.json index 8996829a04..17ad4c2dce 100644 --- a/src/common/settings.json +++ b/src/common/settings.json @@ -3,7 +3,7 @@ { "name": "CollectMetrics", "type": "bool", - "default": 'true' + "default": "true" }, { "name": "UIState", @@ -20,6 +20,16 @@ "name": "EnableTraceLogging", "type": "bool", "default": "false" + }, + { + "name": "DefaultRepositoryLocation", + "type": "string", + "default": "null" + }, + { + "name": "DefaultRepositoryLayout", + "type": "string", + "default": "null" } ] } \ No newline at end of file diff --git a/test/GitHub.App.UnitTests/Services/RepositoryCloneServiceTests.cs b/test/GitHub.App.UnitTests/Services/RepositoryCloneServiceTests.cs index 02e1898222..cbe4127bb2 100644 --- a/test/GitHub.App.UnitTests/Services/RepositoryCloneServiceTests.cs +++ b/test/GitHub.App.UnitTests/Services/RepositoryCloneServiceTests.cs @@ -5,6 +5,7 @@ using GitHub.Api; using GitHub.Models; using GitHub.Services; +using GitHub.Settings; using Microsoft.VisualStudio.Threading; using NSubstitute; using NUnit.Framework; @@ -154,22 +155,67 @@ public async Task CloneIntoEmptyDirectory() operatingSystem.Directory.DidNotReceive().CreateDirectory(clonePath); await vsGitServices.Received().Clone(cloneUrl, clonePath, true); } + } + + public class TheSetDefaultClonePathMethod + { + [TestCase(@"c:\source\owner\repositoryName", "https://github.com/owner/repositoryName", @"c:\source")] + [TestCase(@"c:\source\owner\newRepositoryName", "https://github.com/owner/repositoryName", @"c:\source")] + [TestCase(@"c:\source\owner\repositoryName", "https://github.com/OWNER/repositoryName", @"c:\source")] + [TestCase(@"c:\owner\repositoryName", "https://github.com/owner/repositoryName", @"c:\")] + + [TestCase(@"c:\source\repositoryName", "https://github.com/owner/repositoryName", @"c:\source")] + [TestCase(@"c:\repositoryName", "https://github.com/owner/repositoryName", @"c:\")] + public void SetDefaultClonePath(string targetPath, string cloneUrl, string expectedDefaultPath) + { + var cloneService = CreateRepositoryCloneService(); + + cloneService.SetDefaultClonePath(targetPath, cloneUrl); - static RepositoryCloneService CreateRepositoryCloneService(IOperatingSystem operatingSystem = null, - IVSGitServices vsGitServices = null, IUsageTracker usageTracker = null, - ITeamExplorerServices teamExplorerServices = null, IGitHubServiceProvider serviceProvider = null) + Assert.That(cloneService.DefaultClonePath, Is.EqualTo(expectedDefaultPath)); + } + } + + public class TheDefaultClonePathProperty + { + [TestCase(@"c:\source\owner\name", "https://github.com/owner/name", @"c:\source")] + [TestCase(@"c:\source\name", "https://github.com/owner/name", @"c:\source")] + public void GetDefaultClonePath(string setTargetPath, string setCloneUrl, string expectedDefaultPath) { - operatingSystem = operatingSystem ?? Substitute.For(); - vsGitServices = vsGitServices ?? Substitute.For(); - usageTracker = usageTracker ?? Substitute.For(); - teamExplorerServices = teamExplorerServices ?? Substitute.For(); - serviceProvider = serviceProvider ?? Substitute.For(); + var cloneService = CreateRepositoryCloneService(); - operatingSystem.Environment.ExpandEnvironmentVariables(Args.String).Returns(x => x[0]); + cloneService.SetDefaultClonePath(setTargetPath, setCloneUrl); - return new RepositoryCloneService(operatingSystem, vsGitServices, teamExplorerServices, - Substitute.For(), Substitute.For(), - usageTracker, serviceProvider, new JoinableTaskContext()); + Assert.That(cloneService.DefaultClonePath, Is.EqualTo(expectedDefaultPath)); } } + public class TheDefaultRepositoryLayoutProperty + { + [Test] + public void Defaults_To_Default_Layout() + { + var cloneService = CreateRepositoryCloneService(); + + Assert.That(cloneService.DefaultRepositoryLayout, Is.EqualTo(RepositoryLayout.Default)); + } + } + + static RepositoryCloneService CreateRepositoryCloneService(IOperatingSystem operatingSystem = null, + IVSGitServices vsGitServices = null, IUsageTracker usageTracker = null, + ITeamExplorerServices teamExplorerServices = null, IGitHubServiceProvider serviceProvider = null, + IPackageSettings packageSettings = null) + { + operatingSystem = operatingSystem ?? Substitute.For(); + vsGitServices = vsGitServices ?? Substitute.For(); + usageTracker = usageTracker ?? Substitute.For(); + teamExplorerServices = teamExplorerServices ?? Substitute.For(); + serviceProvider = serviceProvider ?? Substitute.For(); + packageSettings = packageSettings ?? Substitute.For(); + + operatingSystem.Environment.ExpandEnvironmentVariables(Args.String).Returns(x => x[0]); + + return new RepositoryCloneService(operatingSystem, vsGitServices, teamExplorerServices, + Substitute.For(), Substitute.For(), + usageTracker, serviceProvider, new Lazy(() => packageSettings), new JoinableTaskContext()); + } } diff --git a/test/GitHub.App.UnitTests/Services/RepositoryLayoutUtilitiesTests.cs b/test/GitHub.App.UnitTests/Services/RepositoryLayoutUtilitiesTests.cs new file mode 100644 index 0000000000..8e38d8e5d1 --- /dev/null +++ b/test/GitHub.App.UnitTests/Services/RepositoryLayoutUtilitiesTests.cs @@ -0,0 +1,58 @@ +using System; +using GitHub.Services; +using NUnit.Framework; + +public static class RepositoryLayoutUtilitiesTests +{ + public class TheGetDefaultPathAndLayoutMethod + { + [TestCase(@"c:\source\owner\repositoryName", "https://github.com/owner/repositoryName", @"c:\source", RepositoryLayout.OwnerName)] + [TestCase(@"c:\source\owner\differentName", "https://github.com/owner/repositoryName", @"c:\source", RepositoryLayout.OwnerName)] + [TestCase(@"c:\source\repositoryName", "https://github.com/owner/repositoryName", @"c:\source", RepositoryLayout.Name)] + [TestCase(@"c:\source\differentName", "https://github.com/owner/repositoryName", @"c:\source", RepositoryLayout.Name)] + public void GetDefaultPathAndLayout(string repositoryPath, string cloneUrl, string expectPath, RepositoryLayout expectLayout) + { + var (path, layout) = RepositoryLayoutUtilities.GetDefaultPathAndLayout(repositoryPath, cloneUrl); + + Assert.That((path, layout), Is.EqualTo((expectPath, expectLayout))); + } + + [TestCase(@"c:\GitHub\VisualStudio", "https://github.com/github/VisualStudio", @"c:\GitHub", RepositoryLayout.Name)] + [TestCase(@"c:\GitHub\github\VisualStudio", "https://github.com/github/VisualStudio", @"c:\GitHub", RepositoryLayout.OwnerName)] + [TestCase(@"c:\github", "https://github.com/github/github", @"c:\", RepositoryLayout.Name)] + [TestCase(@"c:\github\github", "https://github.com/github/github", @"c:\", RepositoryLayout.OwnerName)] + public void Case_Sensitive_Owner(string repositoryPath, string cloneUrl, string expectPath, RepositoryLayout expectLayout) + { + var (path, layout) = RepositoryLayoutUtilities.GetDefaultPathAndLayout(repositoryPath, cloneUrl); + + Assert.That((path, layout), Is.EqualTo((expectPath, expectLayout))); + } + } + + public class TheGetRepositoryLayoutMethod + { + [TestCase("Name", RepositoryLayout.Name)] + [TestCase("OwnerName", RepositoryLayout.OwnerName)] + [TestCase("Default", RepositoryLayout.Default)] + [TestCase("__UNKNOWN__", RepositoryLayout.Default)] + public void GetDefaultPathAndLayout(string setting, RepositoryLayout expectedLayout) + { + var layout = RepositoryLayoutUtilities.GetRepositoryLayout(setting); + + Assert.That(layout, Is.EqualTo(expectedLayout)); + } + } + + public class TheGetDefaultRepositoryPathMethod + { + [TestCase("https://github.com/github/VisualStudio", @"c:\source", RepositoryLayout.Name, @"c:\source\VisualStudio")] + [TestCase("https://github.com/github/VisualStudio", @"c:\source", RepositoryLayout.OwnerName, @"c:\source\github\VisualStudio")] + [TestCase("https://github.com/github/VisualStudio", @"c:\source", RepositoryLayout.Default, @"c:\source\github\VisualStudio")] + public void GetDefaultRepositoryPath(string cloneUrl, string defaultPath, RepositoryLayout repositoryLayout, string expectedPath) + { + var path = RepositoryLayoutUtilities.GetDefaultRepositoryPath(cloneUrl, defaultPath, repositoryLayout); + + Assert.That(path, Is.EqualTo(expectedPath)); + } + } +} diff --git a/test/GitHub.App.UnitTests/Substitutes.cs b/test/GitHub.App.UnitTests/Substitutes.cs index c47e998657..74dd90d537 100644 --- a/test/GitHub.App.UnitTests/Substitutes.cs +++ b/test/GitHub.App.UnitTests/Substitutes.cs @@ -11,6 +11,7 @@ using GitHub.Factories; using GitHub.Api; using Microsoft.VisualStudio.Threading; +using GitHub.Settings; namespace UnitTests { @@ -89,7 +90,8 @@ public static IGitHubServiceProvider GetServiceProvider( var clone = cloneService ?? new RepositoryCloneService(Substitute.For(), Substitute.For(), Substitute.For(), Substitute.For(), Substitute.For(), - Substitute.For(), ret, new JoinableTaskContext()); + Substitute.For(), ret, new Lazy(() => Substitute.For()), + new JoinableTaskContext()); var create = creationService ?? new RepositoryCreationService(clone); avatarProvider = avatarProvider ?? Substitute.For(); ret.GetService(typeof(IGitService)).Returns(gitservice); diff --git a/test/GitHub.App.UnitTests/ViewModels/Dialog/Clone/RepositoryCloneViewModelTests.cs b/test/GitHub.App.UnitTests/ViewModels/Dialog/Clone/RepositoryCloneViewModelTests.cs index 2bf41bc536..a81f7380bf 100644 --- a/test/GitHub.App.UnitTests/ViewModels/Dialog/Clone/RepositoryCloneViewModelTests.cs +++ b/test/GitHub.App.UnitTests/ViewModels/Dialog/Clone/RepositoryCloneViewModelTests.cs @@ -273,24 +273,27 @@ public void Repository_Name_Replaces_Last_Part_Of_Non_Base_Path() Description = "Path unchanged")] [TestCase("c:\\base", "owner1/repo1", "c:\\base\\owner1\\changed", "owner2/repo2", "c:\\base\\owner2\\repo2", Description = "Repo name changed")] - [TestCase("c:\\base", "owner1/repo1", "c:\\base\\owner1", "owner2/repo2", "c:\\base\\owner2\\repo2", + [TestCase("c:\\base", "owner1/repo1", "c:\\base\\owner1", "owner2/repo2", "c:\\base\\repo2", Description = "Repo name deleted")] - [TestCase("c:\\base", "owner1/repo1", "c:\\base", "owner2/repo2", "c:\\base\\owner2\\repo2", + [TestCase("c:\\base", "owner1/repo1", "c:\\base", "owner2/repo2", "c:\\repo2", Description = "Base path reverted")] [TestCase("c:\\base", "owner1/repo1", "c:\\new\\base\\owner1\\changed", "owner2/repo2", "c:\\new\\base\\owner2\\repo2", Description = "Base path and repo name changed")] - [TestCase("c:\\base", "owner1/repo1", "c:\\new\\base\\owner1", "owner2/repo2", "c:\\new\\base\\owner2\\repo2", + [TestCase("c:\\base", "owner1/repo1", "c:\\new\\base\\owner1", "owner2/repo2", "c:\\new\\base\\repo2", Description = "Base path changed and repo name deleted")] - [TestCase("c:\\base", "owner1/repo1", "c:\\new\\base", "owner2/repo2", "c:\\new\\base\\owner2\\repo2", + [TestCase("c:\\base", "owner1/repo1", "c:\\new\\base", "owner2/repo2", "c:\\new\\repo2", Description = "Base path changed and repo owner/name deleted")] [TestCase("c:\\base", "owner1/repo1", "", "owner2/repo2", "c:\\base\\owner2\\repo2", Description = "Base path cleared")] - [TestCase("c:\\base", "owner1/repo1", "c:\\base\\repo1", "owner2/repo2", "c:\\base\\owner2\\repo2", + [TestCase("c:\\base", "owner1/repo1", "c:\\base\\repo1", "owner2/repo2", "c:\\base\\repo2", Description = "Owner deleted")] [TestCase("c:\\base", "same/same", "c:\\base\\same\\same", "owner2/repo2", "c:\\base\\owner2\\repo2", Description = "Owner and repo have same name")] + + [TestCase("c:\\base", "owner1/repo1", ":", "owner2/repo2", "c:\\base\\owner2\\repo2", + Description = "The path is not of a legal form")] public void User_Edits_Path(string defaultClonePath, string repo1, string userPath, string repo2, string expectPath) { var target = CreateTarget(defaultClonePath: defaultClonePath); diff --git a/test/GitHub.VisualStudio.UnitTests/Substitutes.cs b/test/GitHub.VisualStudio.UnitTests/Substitutes.cs index fe983fde88..b0aa111869 100644 --- a/test/GitHub.VisualStudio.UnitTests/Substitutes.cs +++ b/test/GitHub.VisualStudio.UnitTests/Substitutes.cs @@ -11,6 +11,7 @@ using GitHub.Factories; using GitHub.Api; using Microsoft.VisualStudio.Threading; +using GitHub.Settings; namespace UnitTests { @@ -114,7 +115,8 @@ public static IGitHubServiceProvider GetServiceProvider( var vsgit = IVSGitServices; var clone = cloneService ?? new RepositoryCloneService(os, vsgit, Substitute.For(), Substitute.For(), Substitute.For(), - Substitute.For(), ret, new JoinableTaskContext()); + Substitute.For(), ret, new Lazy(() => Substitute.For()), + new JoinableTaskContext()); var create = creationService ?? new RepositoryCreationService(clone); avatarProvider = avatarProvider ?? Substitute.For(); ret.GetService(typeof(IGitService)).Returns(gitservice);