SONAR-10218 Fix permissions document of api/custom_measures/create

diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java
index 0453dfcc850f53c73f9ccc13e89a712607c3e51e..e24c5ef9c73c4295bad201f9c74979114184b177 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java
@@ -72,7 +72,7 @@ public class CreateAction implements CustomMeasuresWsAction {
     WebService.NewAction action = context.createAction(ACTION)
       .setDescription("Create a custom measure.<br /> " +
         "The project id or the project key must be provided (only project and module custom measures can be created). The metric id or the metric key must be provided.<br/>" +
-        "Requires 'Administer System' permission or 'Administer' permission on the project.")
+        "Requires 'Administer' permission on the project.")
       .setSince("5.2")
       .setPost(true)
       .setHandler(this);

diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java
index a88e7b02db76c7908c58debdf904764d84f71ce7..b5dc9de05d73998f4ae35598e675ba14c327146d 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java
@@ -40,6 +40,7 @@ import org.sonar.db.measure.custom.CustomMeasureDto;
 import org.sonar.db.metric.MetricDto;
 import org.sonar.db.metric.MetricTesting;
 import org.sonar.db.organization.OrganizationDto;
+import org.sonar.db.permission.OrganizationPermission;
 import org.sonar.db.user.UserDto;
 import org.sonar.server.component.TestComponentFinder;
 import org.sonar.server.es.EsTester;
@@ -435,8 +436,8 @@ public class CreateActionTest {
   }
 
   @Test
-  public void fail_when_not_project_administrator() throws Exception {
-    userSession.logIn();
+  public void fail_when_system_administrator() throws Exception {
+    userSession.logIn().setSystemAdministrator().addPermission(OrganizationPermission.ADMINISTER, db.getDefaultOrganization());
     MetricDto metric = insertMetric(STRING);
 
     expectedException.expect(ForbiddenException.class);