aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2017-02-02 11:47:23 +0100
committerJulien Lancelot <julien.lancelot@sonarsource.com>2017-02-03 11:59:06 +0100
commit7e314ff4c23848a2496ed8375d7c8181808c60c2 (patch)
tree3ea11f0b08ed3aacbf1b43a92d67ab2732f9984e
parent9a679cda21dfc990ca59dd7e462bfac574c32a9c (diff)
downloadsonarqube-7e314ff4c23848a2496ed8375d7c8181808c60c2.tar.gz
sonarqube-7e314ff4c23848a2496ed8375d7c8181808c60c2.zip
SONAR-7762 Remove remaing property definition
-rw-r--r--it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java13
-rw-r--r--server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java2
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SonarQubeMonitor.java5
-rw-r--r--server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java1
-rw-r--r--sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java12
-rw-r--r--sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java2
6 files changed, 3 insertions, 32 deletions
diff --git a/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java b/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java
index 7dff2a847ce..491896a1019 100644
--- a/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java
+++ b/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java
@@ -22,7 +22,6 @@ package it.user;
import com.codeborne.selenide.Condition;
import com.sonar.orchestrator.Orchestrator;
import it.Category4Suite;
-import java.io.IOException;
import java.util.UUID;
import org.junit.After;
import org.junit.AfterClass;
@@ -180,18 +179,6 @@ public class LocalAuthenticationTest {
}
@Test
- @Ignore("signing up will be dropped: SONAR-7762")
- public void allow_users_to_sign_up() throws IOException {
- setServerProperty(ORCHESTRATOR, "sonar.allowUsersToSignUp", "true");
-
- runSelenese(ORCHESTRATOR, "/user/LocalAuthenticationTest/allow_users_to_sign_up.html");
-
- // This check is failing because signup doesn't refresh the users ES index !
- // Will be fixed by SONAR-7308
- // userRule.verifyUserExists("signuplogin", "SignUpName", null);
- }
-
- @Test
public void authentication_through_ui() {
runSelenese(ORCHESTRATOR,
"/user/LocalAuthenticationTest/login_successful.html",
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
index 5a09fc50825..b2329a2c1b8 100644
--- a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
@@ -109,7 +109,7 @@ public class ComputeEngineContainerImplTest {
+ 25 // level 1
+ 47 // content of DaoModule
+ 3 // content of EsSearchModule
- + 62 // content of CorePropertyDefinitions
+ + 61 // content of CorePropertyDefinitions
+ 1 // content of CePropertyDefinitions
);
assertThat(picoContainer.getParent().getParent().getParent().getParent()).isNull();
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SonarQubeMonitor.java b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SonarQubeMonitor.java
index 324159c72ab..a9c2bf37104 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SonarQubeMonitor.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SonarQubeMonitor.java
@@ -106,10 +106,6 @@ public class SonarQubeMonitor extends BaseMonitorMBean implements SonarQubeMonit
return settings.getBoolean(CoreProperties.CORE_AUTHENTICATOR_CREATE_USERS);
}
- private boolean getAllowUsersToSignUp() {
- return settings.getBoolean(CoreProperties.CORE_ALLOW_USERS_TO_SIGNUP_PROPERTY);
- }
-
private boolean getForceAuthentication() {
return settings.getBoolean(CoreProperties.CORE_FORCE_AUTHENTICATION_PROPERTY);
}
@@ -136,7 +132,6 @@ public class SonarQubeMonitor extends BaseMonitorMBean implements SonarQubeMonit
addIfNotEmpty("Accepted external identity providers", getEnabledIdentityProviders(), attributes);
addIfNotEmpty("External identity providers whose users are allowed to sign themselves up", getAllowsToSignUpEnabledIdentityProviders(), attributes);
attributes.put("Automatic User Creation", getAutomaticUserCreation());
- attributes.put("Allow Users to Sign Up", getAllowUsersToSignUp());
attributes.put("Force authentication", getForceAuthentication());
attributes.put("Official Distribution", isOfficialDistribution());
attributes.put("Home Dir", settings.getString(ProcessProperties.PATH_HOME));
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java
index 1bcd3f4f3fc..932da2056ac 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java
@@ -164,7 +164,6 @@ public class GlobalActionTest {
settings.setProperty("sonar.lf.enableGravatar", true);
settings.setProperty("sonar.updatecenter.activate", false);
settings.setProperty("sonar.technicalDebt.ratingGrid", "0.05,0.1,0.2,0.5");
- settings.setProperty("sonar.allowUsersToSignUp", true);
when(server.getVersion()).thenReturn("6.2");
when(database.getDialect()).thenReturn(new MySql());
diff --git a/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java b/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java
index aaf797760ae..4c340bdaa44 100644
--- a/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java
+++ b/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java
@@ -33,15 +33,6 @@ class SecurityProperties {
static List<PropertyDefinition> all() {
return ImmutableList.of(
-
- PropertyDefinition.builder(CoreProperties.CORE_ALLOW_USERS_TO_SIGNUP_PROPERTY)
- .defaultValue(Boolean.toString(CoreProperties.CORE_ALLOW_USERS_TO_SIGNUP_DEAULT_VALUE))
- .name("Activate sign up for local account")
- .description("Allow users to sign up online for a local account. For that purpose, a \"Sign Up\" link will be available in the \"Login\" page.")
- .type(PropertyType.BOOLEAN)
- .category(CoreProperties.CATEGORY_SECURITY)
- .build(),
-
PropertyDefinition.builder(CoreProperties.CORE_DEFAULT_GROUP)
.defaultValue(CoreProperties.CORE_DEFAULT_GROUP_DEFAULT_VALUE)
.name("Default user group")
@@ -55,8 +46,7 @@ class SecurityProperties {
.description("Forcing user authentication stops un-logged users to access SonarQube.")
.type(PropertyType.BOOLEAN)
.category(CoreProperties.CATEGORY_SECURITY)
- .build()
- );
+ .build());
}
}
diff --git a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java
index bf9d2501497..b1198a6ef83 100644
--- a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java
@@ -35,7 +35,7 @@ public class CorePropertyDefinitionsTest {
@Test
public void all() {
List<PropertyDefinition> defs = CorePropertyDefinitions.all();
- assertThat(defs).hasSize(64);
+ assertThat(defs).hasSize(63);
}
@Test