Remove GitClient's dependency on GitService

Pass IGitService to GitClient's constructor.
Fix tests for GitClient.

Author: jcansdale

src/GitHub.App/Services/GitClient.cs

@@ -19,14 +19,18 @@ public class GitClient : IGitClient
     {
         const string defaultOriginName = "origin";
         static readonly ILogger log = LogManager.ForContext<GitClient>();
+        readonly IGitService gitService;
         readonly PullOptions pullOptions;
         readonly PushOptions pushOptions;
         readonly FetchOptions fetchOptions;
 
         [ImportingConstructor]
-        public GitClient(IGitHubCredentialProvider credentialProvider)
+        public GitClient(IGitHubCredentialProvider credentialProvider, IGitService gitService)
         {
             Guard.ArgumentNotNull(credentialProvider, nameof(credentialProvider));
+            Guard.ArgumentNotNull(gitService, nameof(gitService));
+
+            this.gitService = gitService;
 
             pushOptions = new PushOptions { CredentialsProvider = credentialProvider.HandleCredentials };
             fetchOptions = new FetchOptions { CredentialsProvider = credentialProvider.HandleCredentials };
@@ -338,7 +342,7 @@ public Task<Remote> GetHttpRemote(IRepository repo, string remote)
 
             return Task.Factory.StartNew(() =>
             {
-                var uri = GitService.GitServiceHelper.GetRemoteUri(repo, remote);
+                var uri = gitService.GetRemoteUri(repo, remote);
                 var remoteName = uri.IsHypertextTransferProtocol ? remote : remote + "-http";
                 var ret = repo.Network.Remotes[remoteName];
                 if (ret == null)

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

@@ -24,7 +24,7 @@ public async Task RetrieveStatus(FileStatus fileStatus, bool expect)
             repo.Head.Returns(Substitute.For<Branch>());
             var treeEntry = null as TreeEntry;
             repo.Head[path].Returns(treeEntry);
-            var gitClient = new GitClient(Substitute.For<IGitHubCredentialProvider>());
+            var gitClient = CreateGitClient();
 
             var modified = await gitClient.IsModified(repo, path, null);
 
@@ -40,7 +40,7 @@ public async Task TreeEntry_Null_False()
             repo.Head.Returns(Substitute.For<Branch>());
             var treeEntry = null as TreeEntry;
             repo.Head[path].Returns(treeEntry);
-            var gitClient = new GitClient(Substitute.For<IGitHubCredentialProvider>());
+            var gitClient = CreateGitClient();
 
             var modified = await gitClient.IsModified(repo, path, null);
 
@@ -58,7 +58,7 @@ public async Task TreeEntryTarget_GitLink_False()
             treeEntry.TargetType.Returns(TreeEntryTargetType.GitLink);
             treeEntry.Target.Returns(Substitute.For<GitLink>());
             repo.Head[path].Returns(treeEntry);
-            var gitClient = new GitClient(Substitute.For<IGitHubCredentialProvider>());
+            var gitClient = CreateGitClient();
 
             var modified = await gitClient.IsModified(repo, path, null);
 
@@ -83,7 +83,7 @@ public async Task ContentChanges(int linesAdded, int linesDeleted, bool expected
             changes.LinesAdded.Returns(linesAdded);
             changes.LinesDeleted.Returns(linesDeleted);
             repo.Diff.Compare(null, null).ReturnsForAnyArgs(changes);
-            var gitClient = new GitClient(Substitute.For<IGitHubCredentialProvider>());
+            var gitClient = CreateGitClient();
 
             var modified = await gitClient.IsModified(repo, path, null);
 
@@ -98,7 +98,7 @@ public class TheIsHeadPushedMethod : TestBaseClass
         [TestCase(null, false)]
         public async Task IsHeadPushed(int? aheadBy, bool expected)
         {
-            var gitClient = new GitClient(Substitute.For<IGitHubCredentialProvider>());
+            var gitClient = CreateGitClient();
             var repository = MockTrackedBranchRepository(aheadBy);
 
             var isHeadPushed = await gitClient.IsHeadPushed(repository);
@@ -129,7 +129,7 @@ public async Task PushesToDefaultOrigin()
             var repository = Substitute.For<IRepository>();
             repository.Head.Returns(head);
             repository.Network.Remotes["origin"].Returns(origin);
-            var gitClient = new GitClient(Substitute.For<IGitHubCredentialProvider>());
+            var gitClient = CreateGitClient();
 
             await gitClient.Push(repository, "master", "origin");
 
@@ -140,7 +140,7 @@ public async Task PushesToDefaultOrigin()
         public async Task DoesNotPushEmptyRepository()
         {
             var repository = Substitute.For<IRepository>();
-            var gitClient = new GitClient(Substitute.For<IGitHubCredentialProvider>());
+            var gitClient = CreateGitClient();
 
             await gitClient.Push(repository, "master", "origin");
 
@@ -157,7 +157,7 @@ public async Task SetsTheConfigToTheRemoteBranch()
             var config = Substitute.For<Configuration>();
             var repository = Substitute.For<IRepository>();
             repository.Config.Returns(config);
-            var gitClient = new GitClient(Substitute.For<IGitHubCredentialProvider>());
+            var gitClient = CreateGitClient();
 
             await gitClient.SetRemote(repository, "origin", new Uri("https://github.com/foo/bar"));
 
@@ -183,7 +183,7 @@ public async Task SetsTheRemoteTrackingBranch()
             branches["refs/heads/master"].Returns(localBranch);
             branches["refs/remotes/origin/master"].Returns(remoteBranch);
 
-            var gitClient = new GitClient(Substitute.For<IGitHubCredentialProvider>());
+            var gitClient = CreateGitClient();
 
             await gitClient.SetTrackingBranch(repository, "master", "origin");
 
@@ -200,7 +200,7 @@ public async Task FetchUsingHttps(string repoUrl, string expectFetchUrl)
             var repo = Substitute.For<IRepository>();
             var uri = new UriString(repoUrl);
             var refSpec = "refSpec";
-            var gitClient = new GitClient(Substitute.For<IGitHubCredentialProvider>());
+            var gitClient = CreateGitClient();
             var expectUrl = UriString.ToUriString(uri.ToRepositoryUrl());
 
             await gitClient.Fetch(repo, uri, refSpec);
@@ -219,7 +219,7 @@ public async Task UseOriginWhenPossible(string fetchUrl, string originUrl, strin
             repo.Network.Remotes["origin"].Returns(remote);
             var fetchUri = new UriString(fetchUrl);
             var refSpec = "refSpec";
-            var gitClient = new GitClient(Substitute.For<IGitHubCredentialProvider>());
+            var gitClient = CreateGitClient();
 
             await gitClient.Fetch(repo, fetchUri, refSpec);
 
@@ -246,7 +246,7 @@ public async Task LocalBaseHeadAndMergeBase_DontFetch()
             var baseRef = "master";
             var pullNumber = 0;
             var repo = MockRepo(baseSha, headSha, expectMergeBaseSha);
-            var gitClient = new GitClient(Substitute.For<IGitHubCredentialProvider>());
+            var gitClient = CreateGitClient();
 
             var mergeBaseSha = await gitClient.GetPullRequestMergeBase(repo, targetCloneUrl, baseSha, headSha, baseRef, pullNumber);
 
@@ -268,7 +268,7 @@ public async Task WhenToFetch(string baseSha, string headSha, string mergeBaseSh
             var repo = MockRepo(baseSha, headSha, mergeBaseSha);
             var remote = Substitute.For<Remote>();
             repo.Network.Remotes.Add(null, null).ReturnsForAnyArgs(remote);
-            var gitClient = new GitClient(Substitute.For<IGitHubCredentialProvider>());
+            var gitClient = CreateGitClient();
 
             try
             {
@@ -291,7 +291,7 @@ public async Task WhatToFetch(string baseSha, string headSha, string mergeBaseSh
         {
             var repo = MockRepo(baseSha, headSha, mergeBaseSha);
             var targetCloneUri = new UriString("https://github.com/owner/repo");
-            var gitClient = new GitClient(Substitute.For<IGitHubCredentialProvider>());
+            var gitClient = CreateGitClient();
 
             try
             {
@@ -326,4 +326,11 @@ static IRepository MockRepo(string baseSha, string headSha, string mergeBaseSha)
             return repo;
         }
     }
+
+    static GitClient CreateGitClient()
+    {
+        return new GitClient(
+            Substitute.For<IGitHubCredentialProvider>(),
+            Substitute.For<IGitService>());
+    }
 }