Update tests for new version of GetPullRequestMergeBase

The new version of this method takes a PR number.

Author: jcansdale

src/GitHub.App/Services/GitClient.cs

@@ -418,45 +418,6 @@ public async Task<string> GetPullRequestMergeBase(IRepository repo,
             return mergeBaseCommit.Sha;
         }
 
-        public async Task<string> GetPullRequestMergeBase(IRepository repo,
-            UriString baseCloneUrl, UriString headCloneUrl, string baseSha, string headSha, string baseRef, string headRef)
-        {
-            Guard.ArgumentNotNull(repo, nameof(repo));
-            Guard.ArgumentNotNull(baseCloneUrl, nameof(baseCloneUrl));
-            Guard.ArgumentNotNull(headCloneUrl, nameof(headCloneUrl));
-            Guard.ArgumentNotEmptyString(baseRef, nameof(baseRef));
-
-            var baseCommit = repo.Lookup<Commit>(baseSha);
-            if (baseCommit == null)
-            {
-                await Fetch(repo, baseCloneUrl, baseRef);
-                baseCommit = repo.Lookup<Commit>(baseSha);
-                if (baseCommit == null)
-                {
-                    throw new NotFoundException($"Couldn't find {baseSha} after fetching from {baseCloneUrl}:{baseRef}.");
-                }
-            }
-
-            var headCommit = repo.Lookup<Commit>(headSha);
-            if (headCommit == null)
-            {
-                await Fetch(repo, headCloneUrl, headRef);
-                headCommit = repo.Lookup<Commit>(headSha);
-                if (headCommit == null)
-                {
-                    throw new NotFoundException($"Couldn't find {headSha} after fetching from {headCloneUrl}:{headRef}.");
-                }
-            }
-
-            var mergeBaseCommit = repo.ObjectDatabase.FindMergeBase(baseCommit, headCommit);
-            if (mergeBaseCommit == null)
-            {
-                throw new NotFoundException($"Couldn't find merge base between {baseCommit} and {headCommit}.");
-            }
-
-            return mergeBaseCommit.Sha;
-        }
-
         public Task<bool> IsHeadPushed(IRepository repo)
         {
             Guard.ArgumentNotNull(repo, nameof(repo));

src/GitHub.Exports.Reactive/Services/IGitClient.cs

@@ -184,22 +184,6 @@ public interface IGitClient
         /// <returns></returns>
         Task<bool> IsModified(IRepository repository, string path, byte[] contents);
 
-        /// <summary>
-        /// Find the merge base SHA between two commits.
-        /// </summary>
-        /// <param name="repository">The repository.</param>
-        /// <param name="baseCloneUrl">The clone url of the PR base.</param>
-        /// <param name="headCloneUrl">The clone url of the PR head.</param>
-        /// <param name="baseSha">The PR base SHA.</param>
-        /// <param name="headSha">The PR head SHA.</param>
-        /// <param name="baseRef">The PR base ref (e.g. 'master').</param>
-        /// <param name="headRef">The PR head ref.</param>
-        /// <returns>
-        /// The merge base SHA or null.
-        /// </returns>
-        /// <exception cref="LibGit2Sharp.NotFoundException">Thrown when the merge base can't be found.</exception>
-        Task<string> GetPullRequestMergeBase(IRepository repo, UriString baseCloneUrl, UriString headCloneUrl, string baseSha, string headSha, string baseRef, string headRef);
-
         /// <summary>
         /// Find the merge base SHA between two commits.
         /// </summary>

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

@@ -162,61 +162,58 @@ public class TheGetPullRequestMergeBaseMethod : TestBaseClass
         [Fact]
         public async Task LocalBaseHeadAndMergeBase_DontFetch()
         {
-            var baseUrl = new UriString("https://github.com/owner/repo");
-            var headUrl = new UriString("https://github.com/owner/repo");
+            var targetCloneUrl = new UriString("https://github.com/owner/repo");
             var baseSha = "baseSha";
             var headSha = "headSha";
             var expectMergeBaseSha = "mergeBaseSha";
             var baseRef = "master";
-            var headRef = "headRef";
+            var pullNumber = 0;
             var repo = MockRepo(baseSha, headSha, expectMergeBaseSha);
             var gitClient = new GitClient(Substitute.For<IGitHubCredentialProvider>());
 
-            var mergeBaseSha = await gitClient.GetPullRequestMergeBase(repo, baseUrl, headUrl, baseSha, headSha, baseRef, headRef);
+            var mergeBaseSha = await gitClient.GetPullRequestMergeBase(repo, targetCloneUrl, baseSha, headSha, baseRef, pullNumber);
 
             repo.Network.DidNotReceiveWithAnyArgs().Fetch(null as Remote, null, null as FetchOptions);
             Assert.Equal(expectMergeBaseSha, mergeBaseSha);
         }
 
         [Theory]
-        [InlineData("https://github.com/owner/repo", "https://github.com/owner/repo", "baseSha", "headSha", "mergeBaseSha", 0)]
-        [InlineData("https://github.com/owner/repo", "https://github.com/owner/repo", null, "headSha", "mergeBaseSha", 1)]
-        [InlineData("https://github.com/owner/repo", "https://github.com/owner/repo", "baseSha", null, "mergeBaseSha", 1)]
-        [InlineData("https://github.com/owner/repo", "https://github.com/owner/repo", "baseSha", "headSha", null, 0)]
-        public async Task WhenToFetch(string baseUrl, string headUrl, string baseSha, string headSha, string mergeBaseSha, int receivedFetch)
+        [InlineData("https://github.com/owner/repo", "baseSha", "headSha", "mergeBaseSha", 0)]
+        [InlineData("https://github.com/owner/repo", null, "headSha", "mergeBaseSha", 1)]
+        [InlineData("https://github.com/owner/repo", "baseSha", null, "mergeBaseSha", 1)]
+        [InlineData("https://github.com/owner/repo", "baseSha", "headSha", null, 0)]
+        public async Task WhenToFetch(string targetCloneUrl, string baseSha, string headSha, string mergeBaseSha, int receivedFetch)
         {
-            var baseUri = new UriString(baseUrl);
-            var headUri = new UriString(headUrl);
+            var targetCloneUri = new UriString("https://github.com/owner/repo");
             var baseRef = "master";
-            var headRef = "headRef";
+            var pullNumber = 0;
             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>());
 
             try
             {
-                await gitClient.GetPullRequestMergeBase(repo, baseUri, headUri, baseSha, headSha, baseRef, headRef);
+                await gitClient.GetPullRequestMergeBase(repo, targetCloneUri, baseSha, headSha, baseRef, pullNumber);
             }
             catch (NotFoundException) { /* We're interested in calls to Fetch even if it throws */ }
 
             repo.Network.Received(receivedFetch).Fetch(Arg.Any<Remote>(), Arg.Any<string[]>(), Arg.Any<FetchOptions>());
         }
 
         [Theory]
-        [InlineData("baseSha", null, "mergeBaseSha", "baseRef", "headRef", "headRef")]
-        [InlineData(null, "headSha", "mergeBaseSha", "baseRef", "headRef", "baseRef")]
-        public async Task WhatToFetch(string baseSha, string headSha, string mergeBaseSha, string baseRef, string headRef,
+        [InlineData("baseSha", null, "mergeBaseSha", "baseRef", 777, "refs/pull/777/head")]
+        [InlineData(null, "headSha", "mergeBaseSha", "baseRef", 777, "baseRef")]
+        public async Task WhatToFetch(string baseSha, string headSha, string mergeBaseSha, string baseRef, int pullNumber,
             string expectRefSpec)
         {
             var repo = MockRepo(baseSha, headSha, mergeBaseSha);
-            var baseUrl = new UriString("https://github.com/owner/repo");
-            var headUrl = new UriString("https://github.com/owner/repo");
+            var targetCloneUri = new UriString("https://github.com/owner/repo");
             var gitClient = new GitClient(Substitute.For<IGitHubCredentialProvider>());
 
             try
             {
-                await gitClient.GetPullRequestMergeBase(repo, baseUrl, headUrl, baseSha, headSha, baseRef, headRef);
+                await gitClient.GetPullRequestMergeBase(repo, targetCloneUri, baseSha, headSha, baseRef, pullNumber);
             }
             catch (NotFoundException) { /* We're interested in calls to Fetch even if it throws */ }
 

src/UnitTests/GitHub.App/Services/PullRequestServiceTests.cs

@@ -168,11 +168,11 @@ static async Task<string> ExtractFile(
 
             if (mergeBaseException == null)
             {
-                gitClient.GetPullRequestMergeBase(Arg.Any<IRepository>(), Arg.Any<UriString>(), Arg.Any<UriString>(), baseSha, headSha, baseRef, headRef).ReturnsForAnyArgs(Task.FromResult(mergeBaseSha));
+                gitClient.GetPullRequestMergeBase(Arg.Any<IRepository>(), Arg.Any<UriString>(), baseSha, headSha, baseRef, pullNumber).ReturnsForAnyArgs(Task.FromResult(mergeBaseSha));
             }
             else
             {
-                gitClient.GetPullRequestMergeBase(Arg.Any<IRepository>(), Arg.Any<UriString>(), Arg.Any<UriString>(), baseSha, headSha, baseRef, headRef).ReturnsForAnyArgs(Task.FromException<string>(mergeBaseException));
+                gitClient.GetPullRequestMergeBase(Arg.Any<IRepository>(), Arg.Any<UriString>(), baseSha, headSha, baseRef, pullNumber).ReturnsForAnyArgs(Task.FromException<string>(mergeBaseException));
             }
 
             gitClient.ExtractFile(Arg.Any<IRepository>(), mergeBaseSha, fileName).Returns(GetFileTask(mergeBaseFileContent));