Merge branch 'master' into feature/open-from-uri-clone-ui

Author: jcansdale

src/GitHub.App/Services/RepositoryCloneService.cs

@@ -173,6 +173,12 @@ public async Task CloneRepository(
             {
                 await vsGitServices.Clone(cloneUrl, repositoryPath, true, progress);
                 await usageTracker.IncrementCounter(x => x.NumberOfClones);
+
+                if (repositoryPath.StartsWith(DefaultClonePath, StringComparison.OrdinalIgnoreCase))
+                {
+                    // Count the number of times users clone into the Default Repository Location
+                    await usageTracker.IncrementCounter(x => x.NumberOfClonesToDefaultClonePath);
+                }
             }
             catch (Exception ex)
             {

src/GitHub.Exports/Models/UsageModel.cs

@@ -93,6 +93,7 @@ public class MeasuresModel
             public int NumberOfEnterpriseClones { get; set; }
             public int NumberOfGitHubOpens { get; set; }
             public int NumberOfEnterpriseOpens { get; set; }
+            public int NumberOfClonesToDefaultClonePath { get; set; }
         }
     }
 }

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

@@ -73,13 +73,36 @@ public async Task UpdatesMetricsWhenCloneOrOpenRepositoryAsync(string cloneUrl,
             var teamExplorerServices = Substitute.For<ITeamExplorerServices>();
             var graphqlFactory = Substitute.For<IGraphQLClientFactory>();
             var usageTracker = Substitute.For<IUsageTracker>();
-            var cloneService = new RepositoryCloneService(operatingSystem, vsGitServices, teamExplorerServices, graphqlFactory, usageTracker);
+            var cloneService = new RepositoryCloneService(operatingSystem, vsGitServices, teamExplorerServices,
+                graphqlFactory, usageTracker);
 
             await cloneService.CloneOrOpenRepository(cloneDialogResult);
 
             await usageTracker.Received(numberOfCalls).IncrementCounter(
                 Arg.Is<Expression<Func<UsageModel.MeasuresModel, int>>>(x =>
                     ((MemberExpression)x.Body).Member.Name == counterName));
         }
+
+        [TestCase(@"c:\default\repo", @"c:\default", 1, nameof(UsageModel.MeasuresModel.NumberOfClonesToDefaultClonePath))]
+        [TestCase(@"c:\not_default\repo", @"c:\default", 0, nameof(UsageModel.MeasuresModel.NumberOfClonesToDefaultClonePath))]
+        public async Task UpdatesMetricsWhenDefaultClonePath(string targetPath, string defaultPath, int numberOfCalls, string counterName)
+        {
+            var serviceProvider = Substitutes.ServiceProvider;
+            var operatingSystem = serviceProvider.GetOperatingSystem();
+            var vsGitServices = serviceProvider.GetVSGitServices();
+            var teamExplorerServices = Substitute.For<ITeamExplorerServices>();
+            vsGitServices.GetLocalClonePathFromGitProvider().Returns(defaultPath);
+            var graphqlFactory = Substitute.For<IGraphQLClientFactory>();
+            var usageTracker = Substitute.For<IUsageTracker>();
+            var cloneService = new RepositoryCloneService(operatingSystem, vsGitServices, teamExplorerServices,
+                graphqlFactory, usageTracker);
+
+            await cloneService.CloneRepository("https://github.com/foo/bar", targetPath);
+            var model = UsageModel.Create(Guid.NewGuid());
+
+            await usageTracker.Received(numberOfCalls).IncrementCounter(
+                Arg.Is<Expression<Func<UsageModel.MeasuresModel, int>>>(x =>
+                    ((MemberExpression)x.Body).Member.Name == counterName));
+        }
     }
 }