Merge lp:~daker/loco-team-portal/fix.tests-2 into lp:loco-team-portal

[Adnane Belmadiaf]

Fixed the teams app tests

[Tarmac WebDev (tarmac-webdev)]

Attempt to merge into lp:loco-team-portal failed due to conflicts:

text conflict in loco_directory/common/launchpad.py

[lp:~daker/loco-team-portal/fix.tests-2]

563. By Adnane Belmadiaf on 2012-11-26

* Merged trunk

=== modified file 'loco_directory/common/launchpad.py'
--- loco_directory/common/launchpad.py	2012-11-18 22:02:56 +0000
+++ loco_directory/common/launchpad.py	2012-11-26 21:09:19 +0000
@@ -55,6 +55,7 @@
         return True
     if is_debug_user(username):
         return True
+    return False
 
 def get_mugshot_url(url):
     # Not ideal, but until LP #713873
 
=== modified file 'loco_directory/teams/tests.py'
--- loco_directory/teams/tests.py	2011-07-22 16:26:13 +0000
+++ loco_directory/teams/tests.py	2012-11-26 21:09:19 +0000
@@ -1,29 +1,75 @@
 from django.test import TestCase
-
+from django.core.urlresolvers import reverse
+from urllib import urlencode
+
+from django.contrib.auth.models import User, Group
+
+from django_openid_auth.models import UserOpenID
+from userprofiles.models import UserProfile
 from teams.models import *
 from common import launchpad
 
-from django.core.urlresolvers import reverse
-
-
-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"]
-    
+
+
+class TestBase(TestCase):
+
+    def setUp(self):
+        # setup test users
+        # user foo
+        self.user_foo = User.objects.create(
+            username='foo',
+        )
+        self.user_foo.set_password('test')
+        self.user_foo.save()
+
+        self.useropenid_foo = UserOpenID(user=self.user_foo,
+            claimed_id='http://example.com/identity_foo',
+            display_id='http://example.com/identity_foo')
+        self.useropenid_foo.save()
+        self.userprofile_foo = UserProfile.objects.create(user=self.user_foo)
+
+        # user bar
+        self.user_bar = User.objects.create(
+            username='bar',
+        )
+        self.user_bar.set_password('test')
+        self.user_bar.save()
+        self.useropenid_bar = UserOpenID(user=self.user_bar,
+            claimed_id='http://example.com/identity_bar',
+            display_id='http://example.com/identity_bar')
+        self.useropenid_bar.save()
+        self.userprofile_bar = UserProfile.objects.create(user=self.user_bar)
+
+        # setup test country
+        self.country = Country.objects.create(name='Test Country')
+
+        # setup test team
+        self.team = Team.objects.create(
+            lp_name='test-team',
+            name='Test Team',
+            owner_profile=self.userprofile_foo,
+        )
+
+        # adding team to county
+        self.team.countries.add(self.country)
+        self.team_group = Group.objects.create(
+            name=self.team.lp_name,
+        )
+
+        # adding user foo to team_group
+        self.user_foo.groups.add(self.team_group)
+        self.user_foo.save()
+
+class ACLChecksTestCase(TestBase):
+
     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)
-
-class EditTeamTestCase(TestCase):
+        team = Team.objects.get(lp_name="test-team")
+        self.assertEquals(launchpad.is_admin_or_owner(self.user_foo.username, team), True)
+        self.assertEquals(launchpad.is_admin_or_owner(self.user_bar.username, team), False)
+
+class EditTeamTestCase(TestBase):
     """
     test if team update works correct
     """
@@ -32,19 +78,22 @@
         test the team update as anonymous user (not logged in)
         """
         #try to access team-update page as not logged in user
-        response = self.client.get(reverse( 'team-edit', args=['ubuntu-de-locoteam'] ), follow=True)
-        self.assertRedirects(response, '/openid/login?next=/teams/ubuntu-de-locoteam/edit', status_code=302, target_status_code=200)
+
+        data = { 'next' : '/teams/test-team/edit' }
+        response = self.client.get(reverse( 'team-edit', args=['test-team'] ), follow=True)
+        self.assertRedirects(response, '/openid/login/?%s' % urlencode(data), status_code=302, target_status_code=200)
+
         #try to update team as not logged in user
-        response = self.client.post(reverse('team-edit', args=['ubuntu-de-locoteam']), {'Country':'Germany', 'forum_url':'http://ubuntuusers.de',  })
-        self.assertRedirects(response, '/openid/login?next=/teams/ubuntu-de-locoteam/edit', status_code=302, target_status_code=200)
-    
+        response = self.client.post(reverse('team-edit', args=['test-team']), {'Country':'Germany', 'forum_url':'http://ubuntuusers.de'}, follow=True)
+        self.assertRedirects(response, '/openid/login/?%s' % urlencode(data), status_code=302, target_status_code=200)
+
     def test_user_with_no_rights(self):
         """
         test the team update with a user which has no rights
         """
         pass
         #FIXME How to use a user with no right with openid?
-    
+
     def test_user_loco_council(self):
         """
         test the team update with a user which is a member of loco council
@@ -59,20 +108,17 @@
         pass
         #FIXME How to use a user with this rights with openid?
 
-class DisplayNameTestCase(TestCase):
-
-    def setUp(self):
-        self.team = Team.objects.create(name='Test Team', lp_name='test-team')
+class DisplayNameTestCase(TestBase):
 
     def test_override_name(self):
         # check without override_name
         self.assertEquals(self.team.display_name, 'Test Team')
-        
+
         # check wih override_name
         self.team.override_name = 'Override Name'
         self.team.save()
         self.assertEquals(self.team.display_name, 'Override Name')
-        
+
     def test_display_name_in_list(self):
         self.team.override_name = 'Override Name'
         self.team.save()
@@ -88,5 +134,6 @@
 
         response = self.client.get('/teams/test-team/')
         self.assertEquals(response.status_code, 200)
+
         self.assertContains(response, 'Override Name', 0) # No instances of override_name
-        self.assertContains(response, 'Test Team', 3) # One instance of the team name
+        self.assertContains(response, 'Test Team', 4) # One instance of the team name