Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-17 02:31:14 +01:00
Code Issues Packages Projects Releases Activity

Delete user after test

Browse Source
This commit is contained in:
René Pfeuffer
2018-09-11 14:28:07 +02:00
parent c21612bd8e
commit b3088fa762
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scm-webapp/src/test/java/sonia/scm/it/GitLfsITCase.java
View File

@@ -51,7 +51,6 @@ import sonia.scm.api.v2.resources.RepositoryDto;
import sonia.scm.api.v2.resources.UserDto; import sonia.scm.api.v2.resources.UserDto;
import sonia.scm.api.v2.resources.UserToUserDtoMapperImpl; import sonia.scm.api.v2.resources.UserToUserDtoMapperImpl;
import sonia.scm.repository.PermissionType; import sonia.scm.repository.PermissionType;
import sonia.scm.repository.Repository;
import sonia.scm.user.User; import sonia.scm.user.User;
import sonia.scm.user.UserTestData; import sonia.scm.user.UserTestData;
import sonia.scm.util.HttpUtil; import sonia.scm.util.HttpUtil;
@@ -117,7 +116,6 @@ public class GitLfsITCase {
} }
@Test @Test
// @Ignore("permissions not yet implemented")
public void testLfsAPIWithOwnerPermissions() throws IOException { public void testLfsAPIWithOwnerPermissions() throws IOException {
uploadAndDownloadAsUser(PermissionType.OWNER); uploadAndDownloadAsUser(PermissionType.OWNER);
} }
@@ -128,9 +126,6 @@ public class GitLfsITCase {
createUser(trillian); createUser(trillian);
try { try {
// TODO enable when permissions are implemented in v2
// repository.getPermissions().add(new Permission(trillian.getId(), permissionType));
// modifyRepository(repository);
String permissionsUrl = repository.getLinks().getLinkBy("permissions").get().getHref(); String permissionsUrl = repository.getLinks().getLinkBy("permissions").get().getHref();
IntegrationTestUtil.createResource(adminClient, URI.create(permissionsUrl)) IntegrationTestUtil.createResource(adminClient, URI.create(permissionsUrl))
.accept("*/*") .accept("*/*")
@@ -146,7 +141,6 @@ public class GitLfsITCase {
} }
@Test @Test
// @Ignore("permissions not yet implemented")
public void testLfsAPIWithWritePermissions() throws IOException { public void testLfsAPIWithWritePermissions() throws IOException {
uploadAndDownloadAsUser(PermissionType.WRITE); uploadAndDownloadAsUser(PermissionType.WRITE);
} }
@@ -163,16 +157,11 @@ public class GitLfsITCase {
.post(ClientResponse.class, dto); .post(ClientResponse.class, dto);
} }
private void modifyRepository(Repository repository) {
adminClient.resource(REST_BASE_URL + "repositories/" + repository.getId() + ".json").put(repository);
}
private void removeUser(User user) { private void removeUser(User user) {
adminClient.resource(REST_BASE_URL + "users/" + user.getId() + ".json").delete(); adminClient.resource(REST_BASE_URL + "users/" + user.getId()).delete();
} }
@Test @Test
// @Ignore("permissions not yet implemented")
public void testLfsAPIWithoutWritePermissions() throws IOException { public void testLfsAPIWithoutWritePermissions() throws IOException {
User trillian = UserTestData.createTrillian(); User trillian = UserTestData.createTrillian();
trillian.setPassword("secret123"); trillian.setPassword("secret123");
@@ -183,9 +172,6 @@ public class GitLfsITCase {
try { try {
// TODO enable when permissions are implemented in v2
// repository.getPermissions().add(new Permission(trillian.getId(), PermissionType.READ));
// modifyRepository(repository);
String permissionsUrl = repository.getLinks().getLinkBy("permissions").get().getHref(); String permissionsUrl = repository.getLinks().getLinkBy("permissions").get().getHref();
IntegrationTestUtil.createResource(adminClient, URI.create(permissionsUrl)) IntegrationTestUtil.createResource(adminClient, URI.create(permissionsUrl))
.accept("*/*") .accept("*/*")
@@ -200,7 +186,6 @@ public class GitLfsITCase {
} }
@Test @Test
// @Ignore("permissions not yet implemented")
public void testLfsDownloadWithReadPermissions() throws IOException { public void testLfsDownloadWithReadPermissions() throws IOException {
User trillian = UserTestData.createTrillian(); User trillian = UserTestData.createTrillian();
trillian.setPassword("secret123"); trillian.setPassword("secret123");
@@ -208,9 +193,6 @@ public class GitLfsITCase {
try { try {
// TODO enable when permissions are implemented in v2
// repository.getPermissions().add(new Permission(trillian.getId(), PermissionType.READ));
// modifyRepository(repository);
String permissionsUrl = repository.getLinks().getLinkBy("permissions").get().getHref(); String permissionsUrl = repository.getLinks().getLinkBy("permissions").get().getHref();
IntegrationTestUtil.createResource(adminClient, URI.create(permissionsUrl)) IntegrationTestUtil.createResource(adminClient, URI.create(permissionsUrl))
.accept("*/*") .accept("*/*")