opendev
/
gerrit
Code Issues Proposed changes

RemoveReviewerControl: Allow to remove self from abandoned change 

Bug: Issue 9419
Change-Id: I75f8570de21af508d124201cd30506606c8f3ed6
This commit is contained in:
David Pursehouse 2018-10-09 15:10:01 +09:00
parent 31e5ee0763
commit fee0a2b30f
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
View File

@ -2086,6 +2086,40 @@ public class ChangeIT extends AbstractDaemonTest {
gApi.changes().id(r.getChangeId()).reviewer("self").remove();
}
@Test
public void removeReviewerSelfFromAbandonedChangePermitted() throws Exception {
PushOneCommit.Result r = createChange();
String changeId = r.getChangeId();
setApiUser(user);
recommend(changeId);
setApiUser(admin);
gApi.changes().id(changeId).abandon();
setApiUser(user);
gApi.changes().id(r.getChangeId()).reviewer("self").remove();
eventRecorder.assertReviewerDeletedEvents(changeId, user.email);
}
@Test
public void removeOtherReviewerFromAbandonedChangeNotPermitted() throws Exception {
PushOneCommit.Result r = createChange();
String changeId = r.getChangeId();
setApiUser(user);
recommend(changeId);
setApiUser(admin);
approve(changeId);
gApi.changes().id(changeId).abandon();
setApiUser(user);
exception.expect(AuthException.class);
exception.expectMessage("remove reviewer not permitted");
gApi.changes().id(r.getChangeId()).reviewer(admin.getId().toString()).remove();
}
@Test
public void deleteVote() throws Exception {
PushOneCommit.Result r = createChange();

2
gerrit-server/src/main/java/com/google/gerrit/server/project/RemoveReviewerControl.java
View File

@ -100,7 +100,7 @@ public class RemoveReviewerControl {
private boolean canRemoveReviewerWithoutPermissionCheck(
Change change, CurrentUser currentUser, Account.Id reviewer, int value)
throws NoSuchProjectException, IOException {
if (!change.getStatus().isOpen()) {
if (change.getStatus().equals(Change.Status.MERGED)) {
return false;
}