Merge pull request #1850 from github/fixes/1847-crash-cancelling-review

Don't crash when cancelling a PR review.

Author: StanleyGoldman

src/GitHub.InlineReviews/Services/PullRequestSession.cs

@@ -230,13 +230,8 @@ public async Task CancelReview()
                 throw new InvalidOperationException("There is no pending review to cancel.");
             }
 
-            await service.CancelPendingReview(LocalRepository, PendingReviewId);
-
-            PullRequest.Reviews = PullRequest.Reviews
-                .Where(x => x.Id != PendingReviewId)
-                .ToList();
-
-            await Update(PullRequest);
+            var pullRequest = await service.CancelPendingReview(LocalRepository, PendingReviewId);
+            await Update(pullRequest);
         }
 
         /// <inheritdoc/>

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

@@ -143,10 +143,11 @@ public async Task IsFalseWhenReviewCancelled()
             {
                 var currentUser = CreateActor();
                 var review = CreateReview(author: currentUser, state: PullRequestReviewState.Pending);
+                var service = Substitute.For<IPullRequestSessionService>();
                 var pr = CreatePullRequest(review);
 
                 var target = new PullRequestSession(
-                    Substitute.For<IPullRequestSessionService>(),
+                    service,
                     currentUser,
                     pr,
                     Substitute.For<ILocalRepositoryModel>(),
@@ -155,6 +156,7 @@ public async Task IsFalseWhenReviewCancelled()
 
                 Assert.That(target.HasPendingReview, Is.True);
 
+                service.CancelPendingReview(null, null).ReturnsForAnyArgs(CreatePullRequest());
                 await target.CancelReview();
 
                 Assert.That(target.HasPendingReview, Is.False);
@@ -329,6 +331,8 @@ public async Task CallsServiceWithNodeId()
                 var service = Substitute.For<IPullRequestSessionService>();
                 var target = CreateTargetWithPendingReview(service);
 
+                service.CancelPendingReview(null, null).ReturnsForAnyArgs(CreatePullRequest());
+
                 await target.CancelReview();
 
                 await service.Received(1).CancelPendingReview(
@@ -342,6 +346,8 @@ public async Task RemovesReviewFromModel()
                 var service = Substitute.For<IPullRequestSessionService>();
                 var target = CreateTargetWithPendingReview(service);
 
+                service.CancelPendingReview(null, null).ReturnsForAnyArgs(CreatePullRequest());
+
                 await target.CancelReview();
 
                 Assert.IsEmpty(target.PullRequest.Reviews);