|
@@ -41,7 +41,6 @@ class MemberTests(TestCase):
|
|
|
|
|
|
member.delete()
|
|
|
|
|
|
-
|
|
|
def test_when_modifiying_member_corresponding_ldap_user_is_also_modified_with_same_data(self):
|
|
|
"""
|
|
|
Test que lorsque l'on modifie un membre, l'utilisateur LDAP
|
|
@@ -77,20 +76,20 @@ class MemberTests(TestCase):
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
@@ -104,7 +103,7 @@ class MemberTests(TestCase):
|
|
|
username = MemberTestsUtils.get_random_username()
|
|
|
password = "1234"
|
|
|
|
|
|
-
|
|
|
+
|
|
|
member = Member(first_name='Passe-partout',
|
|
|
last_name='Du fort Boyard', username=username)
|
|
|
member.save()
|
|
@@ -139,7 +138,6 @@ class MemberTests(TestCase):
|
|
|
|
|
|
member.delete()
|
|
|
|
|
|
-
|
|
|
def test_when_creating_member_ldap_display_name_is_well_defined(self):
|
|
|
"""
|
|
|
Lors de la création d'un membre, le champ "display_name" du LDAP est
|
|
@@ -160,7 +158,6 @@ class MemberTests(TestCase):
|
|
|
|
|
|
member.delete()
|
|
|
|
|
|
-
|
|
|
def test_when_creating_member_username_is_well_defined(self):
|
|
|
"""
|
|
|
Lors de la création d'un membre, le champ "username", s'il n'est pas
|
|
@@ -182,7 +179,6 @@ class MemberTests(TestCase):
|
|
|
|
|
|
member.delete()
|
|
|
|
|
|
-
|
|
|
def test_when_saving_member_and_ldap_fail_dont_save(self):
|
|
|
"""
|
|
|
Test que lors de la sauvegarde d'un membre et que la sauvegarde en LDAP
|
|
@@ -193,7 +189,8 @@ class MemberTests(TestCase):
|
|
|
for dbconnection in db.connections.all():
|
|
|
if (type(dbconnection) is
|
|
|
ldapdb.backends.ldap.base.DatabaseWrapper):
|
|
|
- dbconnection.settings_dict['PREVIOUSPASSWORD'] = dbconnection.settings_dict['PASSWORD']
|
|
|
+ dbconnection.settings_dict[
|
|
|
+ 'PREVIOUSPASSWORD'] = dbconnection.settings_dict['PASSWORD']
|
|
|
dbconnection.settings_dict['PASSWORD'] = 'wrong password test'
|
|
|
|
|
|
|
|
@@ -215,14 +212,15 @@ class MemberTests(TestCase):
|
|
|
for dbconnection in db.connections.all():
|
|
|
if (type(dbconnection) is
|
|
|
ldapdb.backends.ldap.base.DatabaseWrapper):
|
|
|
- dbconnection.settings_dict['PASSWORD'] = dbconnection.settings_dict['PREVIOUSPASSWORD']
|
|
|
+ dbconnection.settings_dict[
|
|
|
+ 'PASSWORD'] = dbconnection.settings_dict['PREVIOUSPASSWORD']
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
@@ -232,14 +230,14 @@ class MemberTests(TestCase):
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
@@ -249,7 +247,7 @@ class MemberTests(TestCase):
|
|
|
"""
|
|
|
Test que end_date_of_membership d'un membre envoi bien la date de fin d'adhésion
|
|
|
"""
|
|
|
-
|
|
|
+
|
|
|
first_name = 'Tin'
|
|
|
last_name = 'Tin'
|
|
|
username = MemberTestsUtils.get_random_username()
|
|
@@ -260,20 +258,19 @@ class MemberTests(TestCase):
|
|
|
start_date = datetime.date.today()
|
|
|
end_date = start_date + datetime.timedelta(365)
|
|
|
|
|
|
-
|
|
|
+
|
|
|
membershipfee = MembershipFee(member=member, amount=20,
|
|
|
- start_date=start_date,
|
|
|
- end_date=end_date)
|
|
|
+ start_date=start_date,
|
|
|
+ end_date=end_date)
|
|
|
membershipfee.save()
|
|
|
|
|
|
self.assertEqual(member.end_date_of_membership(), end_date)
|
|
|
|
|
|
-
|
|
|
def test_member_is_paid_up(self):
|
|
|
"""
|
|
|
Test que end_date_of_membership d'un membre envoi bien la date de fin d'adhésion
|
|
|
"""
|
|
|
-
|
|
|
+
|
|
|
first_name = 'Capitain'
|
|
|
last_name = 'Haddock'
|
|
|
username = MemberTestsUtils.get_random_username()
|
|
@@ -287,19 +284,21 @@ class MemberTests(TestCase):
|
|
|
|
|
|
self.assertEqual(member.is_paid_up(), False)
|
|
|
|
|
|
-
|
|
|
+
|
|
|
membershipfee = MembershipFee(member=member, amount=20,
|
|
|
- start_date=datetime.date.today() - datetime.timedelta(365),
|
|
|
- end_date=datetime.date.today() - datetime.timedelta(10))
|
|
|
+ start_date=datetime.date.today() -
|
|
|
+ datetime.timedelta(365),
|
|
|
+ end_date=datetime.date.today() - datetime.timedelta(10))
|
|
|
membershipfee.save()
|
|
|
|
|
|
|
|
|
self.assertEqual(member.is_paid_up(), False)
|
|
|
|
|
|
-
|
|
|
+
|
|
|
membershipfee = MembershipFee(member=member, amount=20,
|
|
|
- start_date=datetime.date.today() - datetime.timedelta(10),
|
|
|
- end_date=datetime.date.today() + datetime.timedelta(10))
|
|
|
+ start_date=datetime.date.today() -
|
|
|
+ datetime.timedelta(10),
|
|
|
+ end_date=datetime.date.today() + datetime.timedelta(10))
|
|
|
membershipfee.save()
|
|
|
|
|
|
|
|
@@ -314,15 +313,15 @@ class MemberAdminTests(TestCase):
|
|
|
|
|
|
self.admin_user_password = '1234'
|
|
|
self.admin_user = Member.objects.create_superuser(
|
|
|
- username = 'test_admin_user',
|
|
|
- first_name = 'test',
|
|
|
- last_name = 'Admin user',
|
|
|
+ username='test_admin_user',
|
|
|
+ first_name='test',
|
|
|
+ last_name='Admin user',
|
|
|
email='i@mail.com',
|
|
|
password=self.admin_user_password)
|
|
|
|
|
|
self.assertEqual(self.client.login(
|
|
|
username=self.admin_user.username, password=self.admin_user_password), True)
|
|
|
-
|
|
|
+
|
|
|
def tearDown(self):
|
|
|
|
|
|
self.admin_user.delete()
|
|
@@ -342,7 +341,7 @@ class MemberAdminTests(TestCase):
|
|
|
|
|
|
edit_page = self.client.get('/admin/members/member/%i/' % member.id)
|
|
|
self.assertNotContains(edit_page,
|
|
|
- '''<input id="id_username" />''',
|
|
|
+ '''<input id="id_username" />''',
|
|
|
html=True)
|
|
|
|
|
|
member.delete()
|