Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit c798307a authored by Joze RIHTARSIC's avatar Joze RIHTARSIC
Browse files

fix gitlab failed plans

parent 37bf76d4
No related branches found
No related tags found
No related merge requests found
......@@ -48,9 +48,6 @@ public class DBUserToUserROConverter implements Converter<DBUser, UserRO> {
if (!credentials.isEmpty()) {
// expected only one username/password
DBCredential credential = credentials.get(0);
target.setPasswordExpired(credential.getExpireOn() == null || OffsetDateTime.now().isAfter(credential.getExpireOn()));
target.setPasswordUpdatedOn(credential.getChangedOn());
target.setPasswordExpireOn(credential.getExpireOn());
target.setPasswordExpired(isCredentialExpired(credential));
......
......@@ -66,7 +66,7 @@ public class UserResourceIntegrationTest {
@Test
public void testUpdateCurrentUserOK() throws Exception {
// login
MockHttpSession session = loginWithUserGroupAdmin(mvc);
MockHttpSession session = loginWithSystemAdmin(mvc);
// when update data
UserRO userRO = getLoggedUserData(mvc, session);
userRO.setActive(!userRO.isActive());
......@@ -85,7 +85,7 @@ public class UserResourceIntegrationTest {
// given when - log as SMP admin
// then change values and list uses for changed value
MockHttpSession session = loginWithUserGroupAdmin(mvc);
MockHttpSession session = loginWithSystemAdmin(mvc);
UserRO userRO = getLoggedUserData(mvc, session);
assertNotNull(userRO);
// when
......
......@@ -116,7 +116,7 @@ public class TruststoreAdminResourceIntegrationTest {
@Test
public void validateCertificateIdWithEmailSerialNumberInSubjectCertIdTest() throws Exception {
// login
MockHttpSession session = loginWithUserGroupAdmin(mvc);
MockHttpSession session = loginWithSystemAdmin(mvc);
// when update data
UserRO userRO = getLoggedUserData(mvc, session);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment