commit 7591ceb1ec43458a77017d7556d5afc0c08d4bd4
author Kasper Nilsson <kaspern@google.com> Fri May 12 16:16:53 2017 -0700
committer Kasper Nilsson <kaspern@google.com> Fri May 12 16:32:21 2017 -0700
tree 5ae13fa22c9d63ae27f96bef870b23bcef1c691e
parent ffba65759804ca35a914e2326cc96b0cb9046a76

Fix faulty reviewer removal behavior

WIP mode introduced an issue in which _purgeReviewersPendingRemove was
being called as a callback to send. This is expected, but the order of
the parameters being supplied to the function was incorrect. The return
value of send() is always a truthy value, which was then supplied as the
isCancel param of _purgeReviewersPendingRemove.

Bug: Issue 6048
Change-Id: Ic2d2b825c6a83298095aa8c7f3c458c2eed9d195

polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.html

diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.html b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.html
index ef0d9dc..86219e7 100644
--- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.html
+++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.html
@@ -614,8 +614,9 @@
       const reviewer2 = makeAccount();
       const cc1 = makeAccount();
       const cc2 = makeAccount();
+      const cc3 = makeAccount();
       element._reviewers = [reviewer1, reviewer2];
-      element._ccs = [cc1, cc2];
+      element._ccs = [cc1, cc2, cc3];
 
       const mutations = [];
 
@@ -633,6 +634,7 @@
       reviewers.fire('remove', {account: reviewer1});
       ccs.$.entry.fire('add', {value: {account: reviewer1}});
       ccs.fire('remove', {account: cc1});
+      ccs.fire('remove', {account: cc3});
       reviewers.$.entry.fire('add', {value: {account: cc1}});
 
       // Add to other field without removing from former field.
@@ -647,9 +649,10 @@
         return result;
       };
 
-      // Send and purge and verify moves without deletions.
+      // Send and purge and verify moves, delete cc3.
       element.send()
-          .then(element._purgeReviewersPendingRemove.bind(element))
+          .then(keepReviewers =>
+              element._purgeReviewersPendingRemove(false, keepReviewers))
           .then(() => {
             assert.deepEqual(
                 mutations, [
@@ -657,6 +660,7 @@
                   mapReviewer(cc2),
                   mapReviewer(reviewer1, 'CC'),
                   mapReviewer(reviewer2, 'CC'),
+                  {account: cc3, state: 'REMOVED'},
                 ]);
             done();
           });