Merge pull request #1835 from github/fixes/changes-requested-dismissal

Sorting PullRequestReviewState.Dismissed correctly

Author: StanleyGoldman

src/GitHub.App/ViewModels/GitHubPane/PullRequestReviewSummaryViewModel.cs

@@ -90,6 +90,7 @@ static int ToPriority(PullRequestReviewState state)
             {
                 case PullRequestReviewState.Approved:
                 case PullRequestReviewState.ChangesRequested:
+                case PullRequestReviewState.Dismissed:
                     return 1;
                 case PullRequestReviewState.Pending:
                     return 2;

test/GitHub.App.UnitTests/ViewModels/GitHubPane/PullRequestDetailViewModelTests.cs

@@ -137,6 +137,24 @@ public async Task ShouldNotShowPendingReviewForOtherUserAsync()
                 Assert.That(target.Reviews[0].Id, Is.Null);
             }
 
+            [Test]
+            public async Task ShouldNotShowChangesRequestedAfterDismissed()
+            {
+                var dateTimeOffset = DateTimeOffset.Now;
+
+                var target = CreateTarget();
+                var model = CreatePullRequestModel(
+                    CreatePullRequestReviewModel("1", "shana", PullRequestReviewState.ChangesRequested, dateTimeOffset.AddMinutes(1)),
+                    CreatePullRequestReviewModel("2", "shana", PullRequestReviewState.Dismissed, dateTimeOffset.AddMinutes(2)));
+
+                await target.Load(model);
+
+                Assert.That(target.Reviews, Has.Count.EqualTo(2));
+                Assert.That(target.Reviews[0].User.Login, Is.EqualTo("shana"));
+                Assert.That(target.Reviews[0].State, Is.EqualTo(PullRequestReviewState.Dismissed));
+                Assert.That(target.Reviews[1].User.Login, Is.EqualTo("grokys"));
+            }
+
             static PullRequestDetailModel CreatePullRequestModel(
                 params PullRequestReviewModel[] reviews)
             {