DeleteTag{s}IT: Add tests for deleting tag without refs/tags prefix
For DeleteTagsIT, modify the test to include a tag that does not
have the "refs/tags/" prefix.
For DeleteTagIT, add a new test that explicitly uses the REST API to
call the delete endpoint without the prefix. The other tests in this
class are using the API, which already handles prefixes. Since we
now use the REST API, remove the @NoHttpd annotation.
Bug: Issue 6591
Change-Id: Ie2fcdd14a8114d0c56790aa8fcc7bea726e426f8
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteTagIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteTagIT.java
index c9d7446..c229a43 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteTagIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteTagIT.java
@@ -16,9 +16,10 @@
import static com.google.gerrit.server.group.SystemGroupBackend.ANONYMOUS_USERS;
import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
+import static org.eclipse.jgit.lib.Constants.R_TAGS;
import com.google.gerrit.acceptance.AbstractDaemonTest;
-import com.google.gerrit.acceptance.NoHttpd;
+import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.common.data.Permission;
import com.google.gerrit.extensions.api.projects.TagApi;
import com.google.gerrit.extensions.api.projects.TagInput;
@@ -27,7 +28,6 @@
import org.junit.Before;
import org.junit.Test;
-@NoHttpd
public class DeleteTagIT extends AbstractDaemonTest {
private final String TAG = "refs/tags/test";
@@ -82,6 +82,14 @@
assertDeleteSucceeds();
}
+ @Test
+ public void deleteTagByRestWithoutRefsTagsPrefix() throws Exception {
+ grantDelete();
+ String ref = TAG.substring(R_TAGS.length());
+ RestResponse r = userRestSession.delete("/projects/" + project.get() + "/tags/" + ref);
+ r.assertNoContent();
+ }
+
private void blockForcePush() throws Exception {
block(Permission.PUSH, ANONYMOUS_USERS, "refs/tags/*").setForce(true);
}
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteTagsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteTagsIT.java
index 69cd29a..8f24609 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteTagsIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteTagsIT.java
@@ -15,6 +15,8 @@
package com.google.gerrit.acceptance.rest.project;
import static com.google.common.truth.Truth.assertThat;
+import static java.util.stream.Collectors.toList;
+import static org.eclipse.jgit.lib.Constants.R_TAGS;
import static org.junit.Assert.fail;
import com.google.common.collect.ImmutableList;
@@ -36,7 +38,7 @@
@NoHttpd
public class DeleteTagsIT extends AbstractDaemonTest {
private static final ImmutableList<String> TAGS =
- ImmutableList.of("refs/tags/test-1", "refs/tags/test-2", "refs/tags/test-3");
+ ImmutableList.of("refs/tags/test-1", "refs/tags/test-2", "refs/tags/test-3", "test-4");
@Before
public void setUp() throws Exception {
@@ -112,7 +114,7 @@
for (String tag : tags) {
message
.append("Cannot delete ")
- .append(tag)
+ .append(prefixRef(tag))
.append(": it doesn't exist or you do not have permission ")
.append("to delete it\n");
}
@@ -122,18 +124,24 @@
private HashMap<String, RevCommit> initialRevisions(List<String> tags) throws Exception {
HashMap<String, RevCommit> result = new HashMap<>();
for (String tag : tags) {
- result.put(tag, getRemoteHead(project, tag));
+ String ref = prefixRef(tag);
+ result.put(ref, getRemoteHead(project, ref));
}
return result;
}
private void assertRefUpdatedEvents(HashMap<String, RevCommit> revisions) throws Exception {
for (String tag : revisions.keySet()) {
- RevCommit revision = revisions.get(tag);
- eventRecorder.assertRefUpdatedEvents(project.get(), tag, null, revision, revision, null);
+ RevCommit revision = revisions.get(prefixRef(tag));
+ eventRecorder.assertRefUpdatedEvents(
+ project.get(), prefixRef(tag), null, revision, revision, null);
}
}
+ private String prefixRef(String ref) {
+ return ref.startsWith(R_TAGS) ? ref : R_TAGS + ref;
+ }
+
private ProjectApi project() throws Exception {
return gApi.projects().name(project.get());
}
@@ -141,7 +149,9 @@
private void assertTags(List<String> expected) throws Exception {
List<TagInfo> actualTags = project().tags().get();
Iterable<String> actualNames = Iterables.transform(actualTags, b -> b.ref);
- assertThat(actualNames).containsExactlyElementsIn(expected).inOrder();
+ assertThat(actualNames)
+ .containsExactlyElementsIn(expected.stream().map(t -> prefixRef(t)).collect(toList()))
+ .inOrder();
}
private void assertTagsDeleted() throws Exception {
