Merge lp:~dholbach/loco-team-portal/fix-acl-checks into lp:~ltp-devs/loco-team-portal/trunk

[Daniel Holbach]

[lp:~dholbach/loco-team-portal/fix-acl-checks]

102. By Daniel Holbach on 2009-11-12

add two more test

[Efrain Valles (effie-jayx)]

The code works fine here, great coding for testing

review: Approve

=== modified file 'loco_directory/common/launchpad.py'
--- loco_directory/common/launchpad.py	2009-11-09 16:51:29 +0000
+++ loco_directory/common/launchpad.py	2009-11-12 09:16:15 +0000
@@ -43,23 +43,24 @@
     except:
         print >> sys.stderr, 'Something went wrong.'
         return False
-    return user in [a for a in team.members]
+    return user in [a.name for a in team.members]
 
-def is_admin_or_owner(user, team):
+def is_admin_or_owner(username, team):
     # check just using the LD data
-    if user == team.owner:
+    if username == team.owner:
         return True
-    if team.admins.filter(lpid=user.username):
+    if team.admins.filter(lpid=username):
         return True
     
     # more complicated check :-/
     lp = lp_login()
     try:
         lp_team = lp.people[team.lp_name]
-        if lp_team.owner.is_team:
-            if filter(lambda a: a.name == user.username, lp_team.members):
-                return True
     except:
+        print >> sys.stderr, 'Something went wrong.'
         return False
+    if lp_team.team_owner.is_team:
+        if filter(lambda a: a.name == username, lp_team.team_owner.members):
+            return True
     return False
 

=== added file 'loco_directory/teams/tests.py'
--- loco_directory/teams/tests.py	1970-01-01 00:00:00 +0000
+++ loco_directory/teams/tests.py	2009-11-12 09:16:15 +0000
@@ -0,0 +1,28 @@
+from django.test import TestCase
+
+from teams.models import *
+from common import launchpad
+
+class LoCoCouncilACLTestCase(TestCase):
+    def testACLs(self):
+        """Test if LoCo Council check works
+        """
+        self.assertEquals(launchpad.is_user_on_loco_council("popey"), True)
+        self.assertEquals(launchpad.is_user_on_loco_council("jonobacon"), False)
+
+class ACLChecksTestCase(TestCase):
+# to create this, run: 
+#   mkdir teams/fixtures
+#   ./manage.py dumpdata --format xml teams > teams/fixtures/test_data.xml
+    fixtures = ["test_data.xml"]
+    
+    def testAdminIsATeamChecks(self):
+        """Test if check for a more complicated LoCo Team setup works
+        """
+        teams = Team.objects.all()
+        chile = teams.filter(lp_name="ubuntu-cl")[0]
+        self.assertEquals(launchpad.is_admin_or_owner("pvillavi", chile), True)
+
+        venezuela = teams.filter(lp_name="ubuntu-ve")[0]
+        self.assertEquals(launchpad.is_admin_or_owner("effie-jayx", venezuela), True)
+        self.assertEquals(launchpad.is_admin_or_owner("jorge", venezuela), False)

=== modified file 'loco_directory/teams/views.py'
--- loco_directory/teams/views.py	2009-11-10 11:30:15 +0000
+++ loco_directory/teams/views.py	2009-11-12 09:16:15 +0000
@@ -43,7 +43,7 @@
         'team': team,
     }
     if type(request.user) == AnonymousUser or \
-       not launchpad.is_admin_or_owner(request.user, team):
+       not launchpad.is_admin_or_owner(request.user.username, team):
         return render('teams/team_detail.html', context, context_instance=RequestContext(request))
 
     if request.method == "POST":