opendev/gerrit
Code Issues Proposed changes

Don't specify SKIP_MERGEABLE for the get() call in the ChangeApi.

Browse Source 
Change-Id: Ie9e1bc143ca263d95d66c2dee2491a4d0876135e
This commit is contained in:
Han-Wen Nienhuys
2018-01-17 14:06:04 +01:00
parent 4fd1b06cfe
commit a0dbfb46d2
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/server/api/changes/ChangeApiImpl.java
View File

@@ -508,7 +508,9 @@ class ChangeApiImpl implements ChangeApi {
@Override @Override
public ChangeInfo get() throws RestApiException { public ChangeInfo get() throws RestApiException {
return get(EnumSet.complementOf(EnumSet.of(ListChangesOption.CHECK))); return get(
EnumSet.complementOf(
EnumSet.of(ListChangesOption.CHECK, ListChangesOption.SKIP_MERGEABLE)));
} }
@Override @Override

3
javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
View File

@@ -244,6 +244,9 @@ public class ChangeIT extends AbstractDaemonTest {
ChangeInfo c = ChangeInfo c =
gApi.changes().id(triplet).get(ImmutableList.of(ListChangesOption.SKIP_MERGEABLE)); gApi.changes().id(triplet).get(ImmutableList.of(ListChangesOption.SKIP_MERGEABLE));
assertThat(c.mergeable).isNull(); assertThat(c.mergeable).isNull();
c = gApi.changes().id(triplet).get();
assertThat(c.mergeable).isTrue();
} }
@Test @Test