opendev/gerrit
Code Issues Proposed changes

change-merged: set correct newRev on submit by push

Browse Source 
Bug: Issue 11083
Change-Id: I12acf29549c35c93219867348c3691a24415e28c
This commit is contained in:
Sven Selberg
2019-06-27 16:39:59 +02:00
committed by Marco Miller
parent 0f6f21c916
commit 77df787ce5
6 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
javatests/com/google/gerrit/acceptance/git/SubmitOnPushIT.java
View File

@@ -30,9 +30,11 @@ import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.ApprovalsUtil;
import com.google.gerrit.server.events.ChangeMergedEvent;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.inject.Inject;
import java.util.List;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.InvalidRemoteException;
import org.eclipse.jgit.api.errors.TransportException;
@@ -167,6 +169,19 @@ public class SubmitOnPushIT extends AbstractDaemonTest {
assertThat(cd.patchSet(psId).getRevision().get()).isEqualTo(c.name());
}
@Test
public void correctNewRevOnMergeByPushToBranch() throws Exception {
grant(project, "refs/heads/master", Permission.PUSH);
push("refs/for/master", PushOneCommit.SUBJECT, "one.txt", "One");
PushOneCommit.Result r = push("refs/for/master", PushOneCommit.SUBJECT, "two.txt", "Two");
startEventRecorder();
git().push().setRefSpecs(new RefSpec(r.getCommit().name() + ":refs/heads/master")).call();
List<ChangeMergedEvent> changeMergedEvents =
eventRecorder.getChangeMergedEvents(project.get(), "refs/heads/master", 2);
assertThat(changeMergedEvents.get(0).newRev).isEqualTo(r.getPatchSet().getRevision().get());
assertThat(changeMergedEvents.get(1).newRev).isEqualTo(r.getPatchSet().getRevision().get());
}
@Test
public void mergeOnPushToBranchWithChangeMergedInOther() throws Exception {
enableCreateNewChangeForAllNotInTarget();