Verified Commit 03007170 authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg
Browse files

Fix more tests

parent 61408c52
...@@ -152,7 +152,7 @@ class RegistrationAdminTest(TestCase): ...@@ -152,7 +152,7 @@ class RegistrationAdminTest(TestCase):
status=Entry.STATUS_CONFIRM status=Entry.STATUS_CONFIRM
)) ))
self.assertEqual(fields, ['status', 'created_at', self.assertEqual(fields, ['status', 'created_at',
'updated_at', 'payment']) 'updated_at'])
fields = self.admin.get_readonly_fields(request, Registration( fields = self.admin.get_readonly_fields(request, Registration(
status=Entry.STATUS_REJECTED status=Entry.STATUS_REJECTED
...@@ -166,8 +166,8 @@ class RegistrationAdminTest(TestCase): ...@@ -166,8 +166,8 @@ class RegistrationAdminTest(TestCase):
'programme', 'starting_year', 'programme', 'starting_year',
'address_street', 'address_street2', 'address_street', 'address_street2',
'address_postal_code', 'address_city', 'address_postal_code', 'address_city',
'payment', 'membership', 'membership', 'optin_mailinglist',
'optin_mailinglist', 'optin_birthday']) 'optin_birthday'])
fields = self.admin.get_readonly_fields(request, Registration( fields = self.admin.get_readonly_fields(request, Registration(
status=Entry.STATUS_ACCEPTED status=Entry.STATUS_ACCEPTED
...@@ -181,8 +181,8 @@ class RegistrationAdminTest(TestCase): ...@@ -181,8 +181,8 @@ class RegistrationAdminTest(TestCase):
'programme', 'starting_year', 'programme', 'starting_year',
'address_street', 'address_street2', 'address_street', 'address_street2',
'address_postal_code', 'address_city', 'address_postal_code', 'address_city',
'payment', 'membership', 'membership', 'optin_mailinglist',
'optin_mailinglist', 'optin_birthday']) 'optin_birthday'])
def test_get_actions(self): def test_get_actions(self):
actions = self.admin.get_actions(_get_mock_request([])) actions = self.admin.get_actions(_get_mock_request([]))
...@@ -291,14 +291,14 @@ class RenewalAdminTest(TestCase): ...@@ -291,14 +291,14 @@ class RenewalAdminTest(TestCase):
status=Entry.STATUS_CONFIRM status=Entry.STATUS_CONFIRM
)) ))
self.assertEqual(fields, ['status', 'created_at', self.assertEqual(fields, ['status', 'created_at',
'updated_at', 'payment', 'member']) 'updated_at', 'member'])
fields = self.admin.get_readonly_fields(request, Renewal( fields = self.admin.get_readonly_fields(request, Renewal(
status=Entry.STATUS_REJECTED status=Entry.STATUS_REJECTED
)) ))
self.assertCountEqual(fields, ['created_at', 'updated_at', 'status', self.assertCountEqual(fields, ['created_at', 'updated_at', 'status',
'length', 'membership_type', 'remarks', 'length', 'membership_type', 'remarks',
'entry_ptr', 'member', 'payment', 'entry_ptr', 'member',
'membership']) 'membership'])
fields = self.admin.get_readonly_fields(request, Renewal( fields = self.admin.get_readonly_fields(request, Renewal(
...@@ -306,7 +306,7 @@ class RenewalAdminTest(TestCase): ...@@ -306,7 +306,7 @@ class RenewalAdminTest(TestCase):
)) ))
self.assertCountEqual(fields, ['created_at', 'updated_at', 'status', self.assertCountEqual(fields, ['created_at', 'updated_at', 'status',
'length', 'membership_type', 'remarks', 'length', 'membership_type', 'remarks',
'entry_ptr', 'member', 'payment', 'entry_ptr', 'member',
'membership']) 'membership'])
def test_get_actions(self): def test_get_actions(self):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment