mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-13 00:45:44 +01:00
Use Boolean#getBoolean and prefix parameter
This commit is contained in:
@@ -31,11 +31,10 @@ public class SetupContextListener implements ServletContextListener {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void contextInitialized(ServletContextEvent sce) {
|
public void contextInitialized(ServletContextEvent sce) {
|
||||||
String skipAdminCreation = System.getProperty("skipAdminCreation");
|
if (Boolean.getBoolean("sonia.scm.skipAdminCreation")) {
|
||||||
if (skipAdminCreation == null || "false".equalsIgnoreCase(skipAdminCreation)) {
|
|
||||||
administrationContext.runAsAdmin(SetupAction.class);
|
|
||||||
} else {
|
|
||||||
LOG.info("found skipAdminCreation flag; skipping creation of scmadmin");
|
LOG.info("found skipAdminCreation flag; skipping creation of scmadmin");
|
||||||
|
} else {
|
||||||
|
administrationContext.runAsAdmin(SetupAction.class);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ import org.mockito.ArgumentCaptor;
|
|||||||
import org.mockito.InjectMocks;
|
import org.mockito.InjectMocks;
|
||||||
import org.mockito.Mock;
|
import org.mockito.Mock;
|
||||||
import org.mockito.junit.jupiter.MockitoExtension;
|
import org.mockito.junit.jupiter.MockitoExtension;
|
||||||
|
import org.mockito.junit.jupiter.MockitoSettings;
|
||||||
|
import org.mockito.quality.Strictness;
|
||||||
import sonia.scm.security.PermissionAssigner;
|
import sonia.scm.security.PermissionAssigner;
|
||||||
import sonia.scm.security.PermissionDescriptor;
|
import sonia.scm.security.PermissionDescriptor;
|
||||||
import sonia.scm.user.User;
|
import sonia.scm.user.User;
|
||||||
@@ -62,6 +64,21 @@ class SetupContextListenerTest {
|
|||||||
verifyAdminPermissionsAssigned();
|
verifyAdminPermissionsAssigned();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@MockitoSettings(strictness = Strictness.LENIENT)
|
||||||
|
void shouldSkipAdminAccountCreationIfPropertyIsSet() {
|
||||||
|
System.setProperty("sonia.scm.skipAdminCreation", "true");
|
||||||
|
|
||||||
|
try {
|
||||||
|
setupContextListener.contextInitialized(null);
|
||||||
|
|
||||||
|
verify(userManager, never()).create(any());
|
||||||
|
verify(permissionAssigner, never()).setPermissionsForUser(anyString(), any(Collection.class));
|
||||||
|
} finally {
|
||||||
|
System.setProperty("sonia.scm.skipAdminCreation", "");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void shouldDoNothingOnSecondStart() {
|
void shouldDoNothingOnSecondStart() {
|
||||||
List<User> users = Lists.newArrayList(UserTestData.createTrillian());
|
List<User> users = Lists.newArrayList(UserTestData.createTrillian());
|
||||||
|
|||||||
Reference in New Issue
Block a user