Merge branch 'master' into fixes/1828-pr-list-deadlock

Author: StanleyGoldman

src/GitHub.App/Services/PullRequestService.cs

@@ -392,7 +392,7 @@ public IObservable<Unit> Checkout(ILocalRepositoryModel repository, PullRequestD
                     {
                         await gitClient.Checkout(repo, localBranchName);
                     }
-                    else if (repository.CloneUrl.Owner == pullRequest.HeadRepositoryOwner)
+                    else if (string.Equals(repository.CloneUrl.Owner, pullRequest.HeadRepositoryOwner, StringComparison.OrdinalIgnoreCase))
                     {
                         var remote = await gitClient.GetHttpRemote(repo, "origin");
                         await gitClient.Fetch(repo, remote.Name);
@@ -524,7 +524,7 @@ public IObservable<bool> EnsureLocalBranchesAreMarkedAsPullRequests(ILocalReposi
 
         public bool IsPullRequestFromRepository(ILocalRepositoryModel repository, PullRequestDetailModel pullRequest)
         {
-            return pullRequest.HeadRepositoryOwner == repository.CloneUrl.Owner;
+            return string.Equals(repository.CloneUrl?.Owner, pullRequest.HeadRepositoryOwner, StringComparison.OrdinalIgnoreCase);
         }
 
         public IObservable<Unit> SwitchToBranch(ILocalRepositoryModel repository, PullRequestDetailModel pullRequest)

src/GitHub.InlineReviews/Services/PullRequestSessionManager.cs

@@ -225,7 +225,7 @@ async Task<PullRequestSession> GetSessionInternal(string owner, string name, int
         {
             PullRequestSession session = null;
             WeakReference<PullRequestSession> weakSession;
-            var key = Tuple.Create(owner, number);
+            var key = Tuple.Create(owner.ToLowerInvariant(), number);
 
             if (sessions.TryGetValue(key, out weakSession))
             {

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

@@ -777,6 +777,35 @@ public async Task ShouldCheckoutLocalBranchAsync()
             Assert.That(4, Is.EqualTo(gitClient.ReceivedCalls().Count()));
         }
 
+        [Test]
+        public async Task ShouldCheckoutLocalBranchOwnerCaseMismatchAsync()
+        {
+            var gitClient = MockGitClient();
+            var service = CreateTarget(gitClient, MockGitService());
+
+            var localRepo = Substitute.For<ILocalRepositoryModel>();
+            localRepo.CloneUrl.Returns(new UriString("https://foo.bar/Owner/repo"));
+
+            var pr = new PullRequestDetailModel
+            {
+                Number = 5,
+                BaseRefName = "master",
+                BaseRefSha = "123",
+                BaseRepositoryOwner = "owner",
+                HeadRefName = "prbranch",
+                HeadRefSha = "123",
+                HeadRepositoryOwner = "owner",
+            };
+
+            await service.Checkout(localRepo, pr, "prbranch");
+
+            gitClient.Received().Fetch(Arg.Any<IRepository>(), "origin").Forget();
+            gitClient.Received().Checkout(Arg.Any<IRepository>(), "prbranch").Forget();
+            gitClient.Received().SetConfig(Arg.Any<IRepository>(), "branch.prbranch.ghfvs-pr-owner-number", "owner#5").Forget();
+
+            Assert.That(4, Is.EqualTo(gitClient.ReceivedCalls().Count()));
+        }
+
         [Test]
         public async Task ShouldCheckoutBranchFromForkAsync()
         {
@@ -899,6 +928,19 @@ public async Task ShouldReturnPullRequestBranchForPullRequestFromSameRepositoryA
             Assert.That("source", Is.EqualTo(result.Name));
         }
 
+        [Test]
+        public async Task ShouldReturnPullRequestBranchForPullRequestFromSameRepositoryOwnerCaseMismatchAsync()
+        {
+            var service = CreateTarget(MockGitClient(), MockGitService());
+
+            var localRepo = Substitute.For<ILocalRepositoryModel>();
+            localRepo.CloneUrl.Returns(new UriString("https://github.com/Foo/bar"));
+
+            var result = await service.GetLocalBranches(localRepo, CreatePullRequest(fromFork: false));
+
+            Assert.That("source", Is.EqualTo(result.Name));
+        }
+
         [Test]
         public async Task ShouldReturnMarkedBranchForPullRequestFromForkAsync()
         {

test/GitHub.InlineReviews.UnitTests/Services/PullRequestSessionManagerTests.cs

@@ -770,6 +770,19 @@ public async Task GetSessionReturnsSameSessionForSamePullRequest()
                 Assert.That(result1, Is.Not.SameAs(result3));
             }
 
+            [Test]
+            public async Task GetSessionReturnsSameSessionForSamePullRequestOwnerCaseMismatch()
+            {
+                var target = CreateTarget();
+                var newModel = CreatePullRequestModel(NotCurrentBranchPullRequestNumber);
+                var result1 = await target.GetSession("owner", "repo", 5);
+                var result2 = await target.GetSession("Owner", "repo", 5);
+                var result3 = await target.GetSession("owner", "repo", 6);
+
+                Assert.That(result1, Is.SameAs(result2));
+                Assert.That(result1, Is.Not.SameAs(result3));
+            }
+
             [Test]
             public async Task SessionCanBeCollected()
             {