Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 08:25:44 +01:00
Code Issues Packages Projects Releases Activity

fixes integration tests, which are relying on the admin flag

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-03-13 15:56:40 +01:00
parent 1627518954
commit 1179fd37fa
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scm-it/src/test/java/sonia/scm/it/UserITCase.java
View File

@@ -27,7 +27,7 @@ public class UserITCase {
.assertStatusCode(200) .assertStatusCode(200)
.requestUser(newUser) .requestUser(newUser)
.assertStatusCode(200) .assertStatusCode(200)
.assertAdmin(aBoolean -> assertThat(aBoolean).isEqualTo(Boolean.TRUE)) // we could no longer easily check if the user is an admin, because the admin flag is gone
.assertPassword(Assert::assertNull) .assertPassword(Assert::assertNull)
.requestChangePassword(newPassword) .requestChangePassword(newPassword)
.assertStatusCode(204); .assertStatusCode(204);
@@ -36,7 +36,7 @@ public class UserITCase {
.requestIndexResource(newUser, newPassword) .requestIndexResource(newUser, newPassword)
.assertStatusCode(200) .assertStatusCode(200)
.requestUser(newUser) .requestUser(newUser)
.assertAdmin(isAdmin -> assertThat(isAdmin).isEqualTo(Boolean.TRUE)) // we could no longer easily check if the user is an admin, because the admin flag is gone
.assertPassword(Assert::assertNull); .assertPassword(Assert::assertNull);
} }
@@ -52,7 +52,7 @@ public class UserITCase {
.assertStatusCode(200) .assertStatusCode(200)
.requestUser(newUser) .requestUser(newUser)
.assertStatusCode(200) .assertStatusCode(200)
.assertAdmin(aBoolean -> assertThat(aBoolean).isEqualTo(Boolean.TRUE)) // the user anonymous is not an admin // we could no longer easily check if the user is an admin, because the admin flag is gone
.assertPassword(Assert::assertNull) .assertPassword(Assert::assertNull)
.requestChangePassword(newPassword) // the oldPassword is not needed in the user resource .requestChangePassword(newPassword) // the oldPassword is not needed in the user resource
.assertStatusCode(204); .assertStatusCode(204);
@@ -96,7 +96,7 @@ public class UserITCase {
.assertStatusCode(200) .assertStatusCode(200)
.requestUser(newUser) .requestUser(newUser)
.assertStatusCode(200) .assertStatusCode(200)
.assertAdmin(aBoolean -> assertThat(aBoolean).isEqualTo(Boolean.TRUE)) // we could no longer easily check if the user is an admin, because the admin flag is gone
.assertPassword(Assert::assertNull) .assertPassword(Assert::assertNull)
.assertType(s -> assertThat(s).isEqualTo(type)) .assertType(s -> assertThat(s).isEqualTo(type))
.assertPasswordLinkDoesNotExists(); .assertPasswordLinkDoesNotExists();

22
scm-it/src/test/java/sonia/scm/it/utils/TestData.java
View File

@@ -74,9 +74,27 @@ public class TestData {
.append(" }").toString()) .append(" }").toString())
.post(getUsersUrl()) .post(getUsersUrl())
.then() .then()
.statusCode(HttpStatus.SC_CREATED) .statusCode(HttpStatus.SC_CREATED);
;
if (isAdmin) {
assignAdminPermissions(username);
} }
}
public static void assignAdminPermissions(String username) {
LOG.info("assign admin permissions to user {}", username);
given(VndMediaType.PERMISSION_COLLECTION)
.when()
.body("{'permissions': ['*']}".replaceAll("'", "\""))
.put(getPermissionUrl(username))
.then()
.statusCode(HttpStatus.SC_NO_CONTENT);
}
private static URI getPermissionUrl(String username) {
return RestUtil.createResourceUrl(String.format("users/%s/permissions", username));
}
public static void createGroup(String groupName, String desc) { public static void createGroup(String groupName, String desc) {
LOG.info("create group with group name: {} and description {}", groupName, desc); LOG.info("create group with group name: {} and description {}", groupName, desc);
given(VndMediaType.GROUP) given(VndMediaType.GROUP)