SONAR-6429 Add showProvisioning when appropriate

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsNavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsNavigationAction.java
index 5597ac6d550467a62954a444d09ad446e462be1e..83bf6c6312e923de97cee139e7d0f9ba677b89ef 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsNavigationAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsNavigationAction.java
@@ -61,10 +61,12 @@ public class SettingsNavigationAction implements NavigationAction {
 
   @Override
   public void handle(Request request, Response response) throws Exception {
-    boolean isAdmin = UserSession.get().hasGlobalPermission(GlobalPermissions.SYSTEM_ADMIN);
+    UserSession userSession = UserSession.get();
+    boolean isAdmin = userSession.hasGlobalPermission(GlobalPermissions.SYSTEM_ADMIN);
 
     JsonWriter json = response.newJsonWriter().beginObject();
     json.prop("showUpdateCenter", isAdmin && settings.getBoolean(UpdateCenterClient.ACTIVATION_PROPERTY));
+    json.prop("showProvisioning", userSession.hasGlobalPermission(GlobalPermissions.PROVISIONING));
 
     json.name("plugins").beginArray();
     if (isAdmin) {

diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/SettingsNavigationActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/SettingsNavigationActionTest.java
index 2c20285aea66193a8c4f280eb2480018078914a4..16c9b6ea04c343417b7b3f84546f8c0a7a7d6501 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/SettingsNavigationActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/SettingsNavigationActionTest.java
@@ -70,6 +70,14 @@ public class SettingsNavigationActionTest {
     wsTester.newGetRequest("api/navigation", "settings").execute().assertJson(getClass(), "empty.json");
   }
 
+  @Test
+  public void with_provisioning() throws Exception {
+    MockUserSession.set().setGlobalPermissions(GlobalPermissions.PROVISIONING);
+    wsTester = new WsTester(new NavigationWs(new SettingsNavigationAction(settings, new Views(), i18n)));
+
+    wsTester.newGetRequest("api/navigation", "settings").execute().assertJson(getClass(), "with_provisioning.json");
+  }
+
   @Test
   public void with_views() throws Exception {
     MockUserSession.set().setGlobalPermissions(GlobalPermissions.SYSTEM_ADMIN);

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_provisioning.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_provisioning.json
new file mode 100644 (file)
index 0000000..a9c7cf4
--- /dev/null
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_provisioning.json
@@ -0,0 +1,5 @@
+{
+  "showUpdateCenter": false,
+  "showProvisioning": true,
+  "plugins": []
+}

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_update_center.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_update_center.json
index cfed4e34aa70c3803480026fdfda80e5960e8dbf..96067a6482ab9ec0c888d24197c9f9878515de6e 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_update_center.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_update_center.json
@@ -1,4 +1,5 @@
 {
   "showUpdateCenter": true,
+  "showProvisioning": false,
   "plugins": []
 }

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_views.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_views.json
index bcdd2648c368dae582b1461ddaa0eba36ba4fc6c..9eb73a50d5ca7d2890cfbc7e9798bc45cbe8c608 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_views.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/SettingsNavigationActionTest/with_views.json
@@ -1,5 +1,6 @@
 {
   "showUpdateCenter": false,
+  "showProvisioning": false,
   "plugins": [
     {
       "name": "First Page",