Adnane Belmadiaf has proposed merging lp:~daker/loco-directory/fix.team-tests 
into lp:loco-directory.

Requested reviews:
  loco-directory-dev (loco-directory-dev)

For more details, see:
https://code.launchpad.net/~daker/loco-directory/fix.team-tests/+merge/73317
-- 
https://code.launchpad.net/~daker/loco-directory/fix.team-tests/+merge/73317
Your team loco-directory-dev is requested to review the proposed merge of 
lp:~daker/loco-directory/fix.team-tests into lp:loco-directory.
=== modified file 'loco_directory/common/launchpad.py'
--- loco_directory/common/launchpad.py	2011-03-04 18:16:03 +0000
+++ loco_directory/common/launchpad.py	2011-08-30 00:01:13 +0000
@@ -57,6 +57,8 @@
         return True
     if is_debug_user(username):
         return True
+    else:
+        return False
 
 def get_mugshot_url(lp, identity):
     # Not ideal, but until LP #336943

=== modified file 'loco_directory/teams/tests.py'
--- loco_directory/teams/tests.py	2010-01-04 21:09:00 +0000
+++ loco_directory/teams/tests.py	2011-08-30 00:01:13 +0000
@@ -1,42 +1,100 @@
+# coding: utf-8
 from django.test import TestCase
+from django.core.urlresolvers import reverse
+from django.contrib.auth.models import User, Group
+
+from django_openid_auth.models import UserOpenID
 
 from teams.models import *
+from userprofiles.models import UserProfile
 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"]
-    
+
+    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()
+
     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)
+        team = Team.objects.get(lp_name="test-team")
+        self.assertEquals(launchpad.is_admin_or_owner("foo", team), True)
+        self.assertEquals(launchpad.is_admin_or_owner("bar", team), False)
 
 class EditTeamTestCase(TestCase):
     """
     test if team update works correct
     """
+    def setUp(self):
+        # 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',
+        )
+
+        # adding team to county
+        self.team.countries.add(self.country)
+        self.team_group = Group.objects.create(
+            name=self.team.lp_name,
+        )
+
     def test_anonymous_user(self):
         """
         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)
+        response = self.client.get(reverse( 'team-edit', args=['test-team'] ), follow=True)
+        self.assertRedirects(response, '/openid/login/?next=%2Fteams%2Ftest-team%2Fedit', 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',  })
+        self.assertRedirects(response, '/openid/login/?next=%2Fteams%2Ftest-team%2Fedit', status_code=302, target_status_code=200)
     
     def test_user_with_no_rights(self):
         """
@@ -58,7 +116,3 @@
         """
         pass
         #FIXME How to use a user with this rights with openid?
-
-
-
-

_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help   : https://help.launchpad.net/ListHelp

Reply via email to