Fix broken RepositoryCloneService tests

Author: jcansdale

src/GitHub.App/Services/RepositoryCloneService.cs

@@ -161,7 +161,7 @@ public async Task CloneOrOpenRepository(
             teamExplorerServices.ShowHomePage();
 
             var context = gitHubContextService.FindContextFromUrl(url);
-            if (context.LinkType == LinkType.Blob)
+            if (context?.LinkType == LinkType.Blob)
             {
                 // Navigate to file for /blob/ type URLs
                 var (commitish, path, isSha) = gitHubContextService.ResolveBlob(repositoryPath, context);

test/GitHub.App.UnitTests/Services/RepositoryCloneServiceTests.cs

@@ -40,8 +40,11 @@ public async Task UpdatesMetricsWhenRepositoryClonedAsync(string cloneUrl, int n
             var vsGitServices = serviceProvider.GetVSGitServices();
             var teamExplorerServices = Substitute.For<ITeamExplorerServices>();
             var graphqlFactory = Substitute.For<IGraphQLClientFactory>();
+            var gitHubContextService = Substitute.For<IGitHubContextService>();
+            var vsServices = Substitute.For<IVSServices>();
             var usageTracker = Substitute.For<IUsageTracker>();
-            var cloneService = new RepositoryCloneService(operatingSystem, vsGitServices, teamExplorerServices, graphqlFactory, usageTracker);
+            var cloneService = new RepositoryCloneService(operatingSystem, vsGitServices, teamExplorerServices,
+                graphqlFactory, gitHubContextService, vsServices, usageTracker);
 
             await cloneService.CloneRepository(cloneUrl, @"c:\dev\bar");
             var model = UsageModel.Create(Guid.NewGuid());
@@ -72,9 +75,11 @@ public async Task UpdatesMetricsWhenCloneOrOpenRepositoryAsync(string cloneUrl,
             var vsGitServices = serviceProvider.GetVSGitServices();
             var teamExplorerServices = Substitute.For<ITeamExplorerServices>();
             var graphqlFactory = Substitute.For<IGraphQLClientFactory>();
+            var gitHubContextService = Substitute.For<IGitHubContextService>();
+            var vsServices = Substitute.For<IVSServices>();
             var usageTracker = Substitute.For<IUsageTracker>();
             var cloneService = new RepositoryCloneService(operatingSystem, vsGitServices, teamExplorerServices,
-                graphqlFactory, usageTracker);
+                graphqlFactory, gitHubContextService, vsServices, usageTracker);
 
             await cloneService.CloneOrOpenRepository(cloneDialogResult);
 
@@ -93,9 +98,11 @@ public async Task UpdatesMetricsWhenDefaultClonePath(string targetPath, string d
             var teamExplorerServices = Substitute.For<ITeamExplorerServices>();
             vsGitServices.GetLocalClonePathFromGitProvider().Returns(defaultPath);
             var graphqlFactory = Substitute.For<IGraphQLClientFactory>();
+            var gitHubContextService = Substitute.For<IGitHubContextService>();
+            var vsServices = Substitute.For<IVSServices>();
             var usageTracker = Substitute.For<IUsageTracker>();
             var cloneService = new RepositoryCloneService(operatingSystem, vsGitServices, teamExplorerServices,
-                graphqlFactory, usageTracker);
+                graphqlFactory, gitHubContextService, vsServices, usageTracker);
 
             await cloneService.CloneRepository("https://github.com/foo/bar", targetPath);
             var model = UsageModel.Create(Guid.NewGuid());

test/GitHub.App.UnitTests/Substitutes.cs

@@ -112,10 +112,10 @@ public static IGitHubServiceProvider GetServiceProvider(
             var os = OperatingSystem;
             var vsgit = IVSGitServices;
             var clone = cloneService ?? new RepositoryCloneService(os, vsgit, Substitute.For<ITeamExplorerServices>(),
-                Substitute.For<IGraphQLClientFactory>(), Substitute.For<IUsageTracker>());
+                Substitute.For<IGraphQLClientFactory>(), Substitute.For<IGitHubContextService>(),
+                Substitute.For<IVSServices>(), Substitute.For<IUsageTracker>());
             var create = creationService ?? new RepositoryCreationService(clone);
             avatarProvider = avatarProvider ?? Substitute.For<IAvatarProvider>();
-            //ret.GetService(typeof(IGitRepositoriesExt)).Returns(IGitRepositoriesExt);
             ret.GetService(typeof(IGitService)).Returns(gitservice);
             ret.GetService(typeof(IVSServices)).Returns(Substitute.For<IVSServices>());
             ret.GetService(typeof(IVSGitServices)).Returns(vsgit);
@@ -132,11 +132,6 @@ public static IGitHubServiceProvider GetServiceProvider(
             return ret;
         }
 
-        //public static IGitRepositoriesExt GetGitExt(this IServiceProvider provider)
-        //{
-        //    return provider.GetService(typeof(IGitRepositoriesExt)) as IGitRepositoriesExt;
-        //}
-
         public static IVSServices GetVSServices(this IServiceProvider provider)
         {
             return provider.GetService(typeof(IVSServices)) as IVSServices;

test/GitHub.VisualStudio.UnitTests/Substitutes.cs

@@ -112,10 +112,10 @@ public static IGitHubServiceProvider GetServiceProvider(
             var os = OperatingSystem;
             var vsgit = IVSGitServices;
             var clone = cloneService ?? new RepositoryCloneService(os, vsgit, Substitute.For<ITeamExplorerServices>(),
-                Substitute.For<IGraphQLClientFactory>(), Substitute.For<IUsageTracker>());
+                Substitute.For<IGraphQLClientFactory>(), Substitute.For<IGitHubContextService>(), Substitute.For<IVSServices>(),
+                Substitute.For<IUsageTracker>());
             var create = creationService ?? new RepositoryCreationService(clone);
             avatarProvider = avatarProvider ?? Substitute.For<IAvatarProvider>();
-            //ret.GetService(typeof(IGitRepositoriesExt)).Returns(IGitRepositoriesExt);
             ret.GetService(typeof(IGitService)).Returns(gitservice);
             ret.GetService(typeof(IVSServices)).Returns(Substitute.For<IVSServices>());
             ret.GetService(typeof(IVSGitServices)).Returns(vsgit);
@@ -132,11 +132,6 @@ public static IGitHubServiceProvider GetServiceProvider(
             return ret;
         }
 
-        //public static IGitRepositoriesExt GetGitExt(this IServiceProvider provider)
-        //{
-        //    return provider.GetService(typeof(IGitRepositoriesExt)) as IGitRepositoriesExt;
-        //}
-
         public static IVSServices GetVSServices(this IServiceProvider provider)
         {
             return provider.GetService(typeof(IVSServices)) as IVSServices;