SONAR-6487 WS permissions/search_project_permissions do not return component copies used in views for example

2 files changed, 12 insertions, 6 deletions

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_project_permissions-example.json b/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_project_permissions-example.json
index e3436b66386..724353519c3 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_project_permissions-example.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_project_permissions-example.json
@@ -1,4 +1,9 @@
 {
+  "paging": {
+    "pageIndex": 1,
+    "pageSize": 25,
+    "total": 4
+  },
   "projects": [
     {
       "id": "0bd7b1e7-91d6-439e-a607-4a3a9aad3c6a",
@@ -85,10 +90,5 @@
       "name": "See Source Code",
       "description": "Ability to view the project\u0027s source code. (Users will also need \"Browse\" permission)"
     }
-  ],
-  "paging": {
-    "pageIndex": 1,
-    "pageSize": 25,
-    "total": 4
-  }
+  ]
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java
index 86db252ba22..3cf1281ca5d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java
@@ -55,6 +55,7 @@ import static org.sonar.api.server.ws.WebService.Param.PAGE;
 import static org.sonar.api.server.ws.WebService.Param.PAGE_SIZE;
 import static org.sonar.api.server.ws.WebService.Param.TEXT_QUERY;
 import static org.sonar.db.component.ComponentTesting.newDeveloper;
+import static org.sonar.db.component.ComponentTesting.newProjectCopy;
 import static org.sonar.db.component.ComponentTesting.newProjectDto;
 import static org.sonar.db.component.ComponentTesting.newView;
 import static org.sonar.db.user.GroupTesting.newGroupDto;
@@ -104,6 +105,7 @@ public class SearchProjectPermissionsActionTest {
     ComponentDto project2 = insertClang();
     ComponentDto dev = insertDeveloper();
     ComponentDto view = insertView();
+    insertProjectInView(jdk7, view);
 
     insertUserRole(UserRole.ISSUE_ADMIN, user1.getId(), jdk7.getId());
     insertUserRole(UserRole.ADMIN, user1.getId(), jdk7.getId());
@@ -256,6 +258,10 @@ public class SearchProjectPermissionsActionTest {
       .setKey("Java"));
   }
 
+  private ComponentDto insertProjectInView(ComponentDto project, ComponentDto view) {
+    return insertComponent(newProjectCopy("project-in-view-uuid", project, view));
+  }
+
   private ComponentDto insertDeveloper() {
     return insertComponent(newDeveloper("Simon Brandhof")
       .setUuid("4e607bf9-7ed0-484a-946d-d58ba7dab2fb")