diff options
author | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2017-04-03 17:16:06 +0200 |
---|---|---|
committer | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2017-04-04 14:19:36 +0200 |
commit | a7ebff50f3f2046f4d235a49085907aa326b44cd (patch) | |
tree | e9e1872c95bfdb8df25944496fcc3f3df59c8402 /server | |
parent | 619a2b2bdf11bb3d4eb61ae3610ca38f23c2370a (diff) | |
download | sonarqube-a7ebff50f3f2046f4d235a49085907aa326b44cd.tar.gz sonarqube-a7ebff50f3f2046f4d235a49085907aa326b44cd.zip |
Revert "SONAR-8864 add canCreateCustomRule to response of api/rules/app"
This reverts commit 099ae301cc257e62c8bf9db2f2d34ef9f44e8e49.
Diffstat (limited to 'server')
-rw-r--r-- | server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java | 1 | ||||
-rw-r--r-- | server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java | 45 |
2 files changed, 0 insertions, 46 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java index 1a16c72a21e..c757ed20a07 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java @@ -88,7 +88,6 @@ public class AppAction implements RulesWsAction { boolean isAdminister = userSession.hasPermission(OrganizationPermission.ADMINISTER_QUALITY_PROFILES, organization); json.prop("canWrite", isAdminister); json.prop("canCustomizeRule", isAdminister && organization.getUuid().equals(defaultOrganizationProvider.get().getUuid())); - json.prop("canCreateCustomRule", isAdminister && organization.getUuid().equals(defaultOrganizationProvider.get().getUuid())); } private void addProfiles(DbSession dbSession, OrganizationDto organization, JsonWriter json) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java index da6ec1937a7..9c4e519c70d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/AppActionTest.java @@ -254,51 +254,6 @@ public class AppActionTest { assertJson(json).isSimilarTo("{ \"canCustomizeRule\": false }"); } - @Test - public void canCreateCustomRule_is_true_if_user_is_profile_administrator_of_default_organization_and_no_organization_is_specified() { - userSession.addPermission(OrganizationPermission.ADMINISTER_QUALITY_PROFILES, db.getDefaultOrganization()); - - String json = tester.newRequest().execute().getInput(); - - assertJson(json).isSimilarTo("{ \"canCreateCustomRule\": true }"); - } - - @Test - public void canCreateCustomRule_is_true_if_user_is_profile_administrator_of_specified_default_organization() { - userSession.addPermission(OrganizationPermission.ADMINISTER_QUALITY_PROFILES, db.getDefaultOrganization()); - - String json = tester.newRequest() - .setParam("organization", db.getDefaultOrganization().getKey()) - .execute().getInput(); - - assertJson(json).isSimilarTo("{ \"canCreateCustomRule\": true }"); - } - - @Test - public void canCreateCustomRule_is_false_if_user_is_profile_administrator_of_specified_non_default_organization() { - OrganizationDto organization = db.organizations().insert(); - userSession.addPermission(OrganizationPermission.ADMINISTER_QUALITY_PROFILES, organization); - - String json = tester.newRequest() - .setParam("organization", organization.getKey()) - .execute().getInput(); - - assertJson(json).isSimilarTo("{ \"canCreateCustomRule\": false }"); - } - - @Test - public void canCreateCustomRule_is_false_if_user_is_not_profile_administrator_of_specified_non_default_organization() { - OrganizationDto organization1 = db.organizations().insert(); - OrganizationDto organization2 = db.organizations().insert(); - userSession.addPermission(OrganizationPermission.ADMINISTER_QUALITY_PROFILES, organization1); - - String json = tester.newRequest() - .setParam("organization", organization2.getKey()) - .execute().getInput(); - - assertJson(json).isSimilarTo("{ \"canCreateCustomRule\": false }"); - } - private void insertRules() { RuleRepositoryDto repo1 = new RuleRepositoryDto("xoo", "xoo", "SonarQube"); RuleRepositoryDto repo2 = new RuleRepositoryDto("squid", "ws", "SonarQube"); |