From f48fce0b1f266ecd06bf25f79954b3a2fef923f8 Mon Sep 17 00:00:00 2001
From: Teryk Bellahsene <teryk.bellahsene@sonarsource.com>
Date: Fri, 10 Jun 2016 11:03:29 +0200
Subject: [PATCH] Fix IT - WS api/permissions/search_templates returns all
 project permissions

---
 .../test/java/it/authorisation/PermissionSearchTest.java   | 7 ++++++-
 .../java/org/sonar/core/permission/ProjectPermissions.java | 2 +-
 .../org/sonar/core/permission/ProjectPermissionsTest.java  | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/it/it-tests/src/test/java/it/authorisation/PermissionSearchTest.java b/it/it-tests/src/test/java/it/authorisation/PermissionSearchTest.java
index d0303175b7d..06728cb237b 100644
--- a/it/it-tests/src/test/java/it/authorisation/PermissionSearchTest.java
+++ b/it/it-tests/src/test/java/it/authorisation/PermissionSearchTest.java
@@ -29,6 +29,7 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.sonarqube.ws.WsPermissions;
+import org.sonarqube.ws.WsPermissions.Permission;
 import org.sonarqube.ws.WsPermissions.SearchTemplatesWsResponse;
 import org.sonarqube.ws.client.PostRequest;
 import org.sonarqube.ws.client.WsClient;
@@ -46,6 +47,7 @@ import org.sonarqube.ws.client.permission.UsersWsRequest;
 import util.QaOnly;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
 import static util.ItUtils.newAdminWsClient;
 import static util.ItUtils.projectDir;
 
@@ -155,7 +157,10 @@ public class PermissionSearchTest {
     SearchTemplatesWsResponse clearedSearchTemplatesWsResponse = permissionsWsClient.searchTemplates(
       new SearchTemplatesWsRequest()
         .setQuery("my-new-template"));
-    assertThat(clearedSearchTemplatesWsResponse.getPermissionTemplates(0).getPermissionsList()).isEmpty();
+    assertThat(clearedSearchTemplatesWsResponse.getPermissionTemplates(0).getPermissionsList())
+      .extracting(Permission::getUsersCount, Permission::getGroupsCount)
+      .hasSize(5)
+      .containsOnly(tuple(0, 0));
   }
 
   private static void createUser(String login, String name) {
diff --git a/sonar-db/src/main/java/org/sonar/core/permission/ProjectPermissions.java b/sonar-db/src/main/java/org/sonar/core/permission/ProjectPermissions.java
index a1bff5f9829..910627644a9 100644
--- a/sonar-db/src/main/java/org/sonar/core/permission/ProjectPermissions.java
+++ b/sonar-db/src/main/java/org/sonar/core/permission/ProjectPermissions.java
@@ -33,7 +33,7 @@ public final class ProjectPermissions {
   /**
    * All the component permissions values, ordered from {@link UserRole#USER} to {@link GlobalPermissions#SCAN_EXECUTION}.
    */
-  public static final List<String> ALL = ImmutableList.of(UserRole.USER, UserRole.ADMIN, UserRole.ISSUE_ADMIN, UserRole.CODEVIEWER, GlobalPermissions.SCAN_EXECUTION);
+  public static final List<String> ALL = ImmutableList.of(UserRole.ADMIN,  UserRole.CODEVIEWER, UserRole.ISSUE_ADMIN, GlobalPermissions.SCAN_EXECUTION, UserRole.USER);
 
   public static final String ALL_ON_ONE_LINE = Joiner.on(", ").join(ProjectPermissions.ALL);
 
diff --git a/sonar-db/src/test/java/org/sonar/core/permission/ProjectPermissionsTest.java b/sonar-db/src/test/java/org/sonar/core/permission/ProjectPermissionsTest.java
index b634c0063b9..d38ab0fda6b 100644
--- a/sonar-db/src/test/java/org/sonar/core/permission/ProjectPermissionsTest.java
+++ b/sonar-db/src/test/java/org/sonar/core/permission/ProjectPermissionsTest.java
@@ -28,11 +28,11 @@ public class ProjectPermissionsTest {
 
   @Test
   public void all_permissions() throws Exception {
-    assertThat(ProjectPermissions.ALL).containsOnly(UserRole.USER, UserRole.ADMIN, UserRole.ISSUE_ADMIN, UserRole.CODEVIEWER, GlobalPermissions.SCAN_EXECUTION);
+    assertThat(ProjectPermissions.ALL).containsExactly(UserRole.ADMIN, UserRole.CODEVIEWER, UserRole.ISSUE_ADMIN, GlobalPermissions.SCAN_EXECUTION, UserRole.USER);
   }
 
   @Test
   public void all_permissions_as_string() throws Exception {
-    assertThat(ProjectPermissions.ALL_ON_ONE_LINE).isEqualTo("user, admin, issueadmin, codeviewer, scan");
+    assertThat(ProjectPermissions.ALL_ON_ONE_LINE).isEqualTo("admin, codeviewer, issueadmin, scan, user");
   }
 }
-- 
2.39.5