blob: 374fb13edbb4014675e76a3161737e2ba911ad08 [file] [log] [blame]
// Copyright (C) 2013 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.acceptance.rest.change;
import static com.google.common.truth.Truth.assertThat;
import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.extensions.client.SubmitType;
import com.google.gerrit.extensions.common.ActionInfo;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.server.data.RefUpdateAttribute;
import org.eclipse.jgit.revwalk.RevCommit;
import org.junit.Test;
import java.util.Map;
public class SubmitByFastForwardIT extends AbstractSubmit {
@Override
protected SubmitType getSubmitType() {
return SubmitType.FAST_FORWARD_ONLY;
}
@Test
public void submitWithFastForward() throws Exception {
RevCommit oldHead = getRemoteHead();
PushOneCommit.Result change = createChange();
submit(change.getChangeId());
RevCommit head = getRemoteHead();
assertThat(head.getId()).isEqualTo(change.getCommitId());
assertThat(head.getParent(0)).isEqualTo(oldHead);
assertSubmitter(change.getChangeId(), 1);
}
@Test
public void submitTwoChangesWithFastForward() throws Exception {
RevCommit originalHead = getRemoteHead();
PushOneCommit.Result change = createChange();
PushOneCommit.Result change2 = createChange();
String id1 = change.getChangeId();
String id2 = change2.getChangeId();
approve(id1);
submit(id2);
RevCommit updatedHead = getRemoteHead();
assertThat(updatedHead.getId()).isEqualTo(change2.getCommit());
assertThat(updatedHead.getParent(0).getId()).isEqualTo(change.getCommit());
assertSubmitter(change.getChangeId(), 1);
assertSubmitter(change2.getChangeId(), 1);
assertPersonEquals(admin.getIdent(), updatedHead.getAuthorIdent());
assertPersonEquals(admin.getIdent(), updatedHead.getCommitterIdent());
assertSubmittedTogether(id1, id2, id1);
assertSubmittedTogether(id2, id2, id1);
RefUpdateAttribute refUpdate = getOneRefUpdate(
project.get() + "-refs/heads/master");
assertThat(refUpdate).isNotNull();
assertThat(refUpdate.oldRev).isEqualTo(originalHead.name());
assertThat(refUpdate.newRev).isEqualTo(updatedHead.name());
}
@Test
public void submitTwoChangesWithFastForward_missingDependency() throws Exception {
RevCommit oldHead = getRemoteHead();
PushOneCommit.Result change1 = createChange();
PushOneCommit.Result change2 = createChange();
Change.Id id1 = change1.getPatchSetId().getParentKey();
submitWithConflict(change2.getChangeId(),
"The change could not be submitted because it depends on change(s) [" +
id1 + "], which could not be submitted because:\n" +
id1 + ": needs Code-Review;");
RevCommit head = getRemoteHead();
assertThat(head.getId()).isEqualTo(oldHead.getId());
}
@Test
public void submitFastForwardNotPossible_Conflict() throws Exception {
RevCommit initialHead = getRemoteHead();
PushOneCommit.Result change =
createChange("Change 1", "a.txt", "content");
submit(change.getChangeId());
RevCommit oldHead = getRemoteHead();
testRepo.reset(initialHead);
PushOneCommit.Result change2 =
createChange("Change 2", "b.txt", "other content");
approve(change2.getChangeId());
Map<String, ActionInfo> actions = getActions(change2.getChangeId());
assertThat(actions).containsKey("submit");
ActionInfo info = actions.get("submit");
assertThat(info.enabled).isNull();
submitWithConflict(change2.getChangeId(),
"Cannot merge " + change2.getCommitId().name() + "\n" +
"Project policy requires all submissions to be a fast-forward.\n\n" +
"Please rebase the change locally and upload again for review.");
assertThat(getRemoteHead()).isEqualTo(oldHead);
assertSubmitter(change.getChangeId(), 1);
}
}