Merge lp:~salgado/offspring/project-list into lp:~linaro-automation/offspring/private-builds

[Guilherme Salgado]

Change the project list view to show private projects the user is allowed to see

[lp:~salgado/offspring/project-list]

63. By Guilherme Salgado on 2011-10-17

Fix a typo in the name of the new test class

[James Tunnicliffe (dooferlad)]

Nice.

review: Approve

=== modified file 'lib/offspring/web/queuemanager/tests/test_views.py'
--- lib/offspring/web/queuemanager/tests/test_views.py	2011-10-10 21:15:48 +0000
+++ lib/offspring/web/queuemanager/tests/test_views.py	2011-10-17 20:00:28 +0000
@@ -298,12 +298,39 @@
     def test_private_builds_are_not_shown_if_user_has_no_rights(self):
         project = factory.makeProject(is_private=True)
         build = factory.makeBuildResult(project=project)
-        user = factory.makeUser()
+        make_user_and_login(self.client)
+        response = self.client.get(reverse(self.view_path))
+        self.assertNotContains(
+            response, build.name, status_code=200, msg_prefix=response.content)
+
+
+class ProjectListTests(TestCase):
+    view_path = 'offspring.web.queuemanager.views.projects'
+
+    def test_public_projects_are_shown_to_anyone(self):
+        project = factory.makeProject(is_private=False)
+        response = self.client.get(reverse(self.view_path))
+        self.assertContains(
+            response, project.name, status_code=200,
+            msg_prefix=response.content)
+
+    def test_private_projects_are_shown_if_user_has_rights(self):
+        project = factory.makeProject(is_private=True)
+        user = project.owner
         self.assertTrue(
             self.client.login(username=user.username, password=user.username))
         response = self.client.get(reverse(self.view_path))
+        self.assertContains(
+            response, project.name, status_code=200,
+            msg_prefix=response.content)
+
+    def test_private_projects_are_not_shown_if_user_has_no_rights(self):
+        project = factory.makeProject(is_private=True)
+        make_user_and_login(self.client)
+        response = self.client.get(reverse(self.view_path))
         self.assertNotContains(
-            response, build.name, status_code=200, msg_prefix=response.content)
+            response, project.name, status_code=200,
+            msg_prefix=response.content)
 
 
 def make_user_and_login(client):

=== modified file 'lib/offspring/web/queuemanager/views.py'
--- lib/offspring/web/queuemanager/views.py	2011-10-13 22:59:59 +0000
+++ lib/offspring/web/queuemanager/views.py	2011-10-17 20:00:28 +0000
@@ -88,7 +88,9 @@
     return object_detail(request, **page_info)
 
 def projects(request):
-    projects = Project.objects.select_related('project_group').order_by("project_group")
+    projects = Project.all_objects.accessible_by_user(request.user)
+    projects = projects.select_related('project_group').order_by(
+        "project_group")
     if request.path == "/" or request.path == "":
         pillar = "home"
         #XXX: Move logic for determining active projects into model manager.