From 7641b2963fd24f6cc257f414c251d1c4171cd5bb Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Tue, 30 Mar 2021 10:17:31 -0400 Subject: [PATCH 1/2] fix failing test for deactivate by id #7629 Use the id from authenticateduser rather than builtinuser. Also remove superuser, no longer needed. --- .../harvard/iq/dataverse/api/DeactivateUsersIT.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DeactivateUsersIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DeactivateUsersIT.java index 374a19f453d..2b7e71341ec 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/DeactivateUsersIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/DeactivateUsersIT.java @@ -142,19 +142,11 @@ public void testDeactivateUser() { @Test public void testDeactivateUserById() { - Response createSuperuser = UtilIT.createRandomUser(); - createSuperuser.then().assertThat().statusCode(OK.getStatusCode()); - String superuserUsername = UtilIT.getUsernameFromResponse(createSuperuser); - String superuserApiToken = UtilIT.getApiTokenFromResponse(createSuperuser); - Response toggleSuperuser = UtilIT.makeSuperUser(superuserUsername); - toggleSuperuser.then().assertThat() - .statusCode(OK.getStatusCode()); - Response createUser = UtilIT.createRandomUser(); createUser.prettyPrint(); createUser.then().assertThat().statusCode(OK.getStatusCode()); String username = UtilIT.getUsernameFromResponse(createUser); - Long userId = JsonPath.from(createUser.body().asString()).getLong("data.user.id"); + Long userId = JsonPath.from(createUser.body().asString()).getLong("data.authenticatedUser.id"); String apiToken = UtilIT.getApiTokenFromResponse(createUser); Response deactivateUser = UtilIT.deactivateUser(userId); From c268eca9c72ae560de5f0add5c6e08b6787f4ed1 Mon Sep 17 00:00:00 2001 From: Gustavo Durand Date: Tue, 30 Mar 2021 10:26:30 -0400 Subject: [PATCH 2/2] Removed a couple of extraneous lines --- .../edu/harvard/iq/dataverse/api/DeactivateUsersIT.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DeactivateUsersIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DeactivateUsersIT.java index 2b7e71341ec..de2a1d422c0 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/DeactivateUsersIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/DeactivateUsersIT.java @@ -141,14 +141,12 @@ public void testDeactivateUser() { @Test public void testDeactivateUserById() { - + Response createUser = UtilIT.createRandomUser(); createUser.prettyPrint(); createUser.then().assertThat().statusCode(OK.getStatusCode()); - String username = UtilIT.getUsernameFromResponse(createUser); + Long userId = JsonPath.from(createUser.body().asString()).getLong("data.authenticatedUser.id"); - String apiToken = UtilIT.getApiTokenFromResponse(createUser); - Response deactivateUser = UtilIT.deactivateUser(userId); deactivateUser.prettyPrint(); deactivateUser.then().assertThat().statusCode(OK.getStatusCode());