Fix mentioned activemembers fixtures

website/activemembers/fixtures/committees.json → website/activemembers/fixtures/member_groups.json

 [
 {
-    "model": "activemembers.committee",
+    "model": "activemembers.membergroup",
     "pk": 1,
     "fields": {
         "name_nl": "testcie1",
@@ -17,7 +17,7 @@
     }
 },
 {
-    "model": "activemembers.committee",
+    "model": "activemembers.membergroup",
     "pk": 2,
     "fields": {
         "name_nl": "testcie2",
@@ -30,7 +30,7 @@
     }
 },
 {
-    "model": "activemembers.committee",
+    "model": "activemembers.membergroup",
     "pk": 3,
     "fields": {
         "name_nl": "testbestuur1",
@@ -42,11 +42,41 @@
         "until": "1991-09-01"
     }
 },
+{
+    "model": "activemembers.membergroup",
+    "pk": 4,
+    "fields": {
+        "name_nl": "testsoc1",
+        "name_en": "testsoc1",
+        "active": "True",
+        "description_nl": "testdesc1",
+        "description_en": "testdesc1",
+        "since": "1990-09-01",
+        "until": "1991-09-01"
+    }
+},
+{
+    "model": "activemembers.committee",
+    "pk": 1,
+    "fields": {
+    }
+},
+{
+    "model": "activemembers.committee",
+    "pk": 2,
+    "fields": {
+    }
+},
 {
     "model": "activemembers.board",
     "pk": 3,
     "fields": {
-        "is_board": true
+    }
+},
+{
+    "model": "activemembers.society",
+    "pk": 4,
+    "fields": {
     }
 }
 ]

website/activemembers/tests.py

@@ -10,7 +10,7 @@ from members.models import Member
 
 
 class CommitteeMembersTest(TestCase):
-    fixtures = ['members.json', 'committees.json']
+    fixtures = ['members.json', 'member_groups.json']
 
     @classmethod
     def setUpTestData(cls):
@@ -90,7 +90,7 @@ class CommitteeMembersTest(TestCase):
 
 
 class CommitteeMembersChairTest(TestCase):
-    fixtures = ['members.json', 'committees.json']
+    fixtures = ['members.json', 'member_groups.json']
 
     @classmethod
     def setUpTestData(cls):
@@ -130,7 +130,7 @@ class CommitteeMembersChairTest(TestCase):
 
 
 class PermissionsBackendTest(TestCase):
-    fixtures = ['members.json', 'committees.json']
+    fixtures = ['members.json', 'member_groups.json']
 
     @classmethod
     def setUpTestData(cls):
@@ -157,7 +157,7 @@ class PermissionsBackendTest(TestCase):
 
 
 class CommitteeMailingListTest(TestCase):
-    fixtures = ['mailinglists.json', 'committees.json']
+    fixtures = ['mailinglists.json', 'member_groups.json']
 
     @classmethod
     def setUpTestData(cls):
@@ -206,7 +206,7 @@ class CommitteeMailingListTest(TestCase):
 
 
 class BoardTest(TestCase):
-    fixtures = ['committees.json']
+    fixtures = ['member_groups.json']
 
     def setUp(self):
         self.testboard = Board.objects.get(pk=3)

website/events/tests/test_admin.py

@@ -73,7 +73,7 @@ class DoNextModelAdminTest(TestCase):
 
 @freeze_time('2017-01-01')
 class RegistrationInformationFieldInlineTest(TestCase):
-    fixtures = ['members.json', 'committees.json']
+    fixtures = ['members.json', 'member_groups.json']
 
     @classmethod
     def setUpTestData(cls):
@@ -148,7 +148,7 @@ class RegistrationInformationFieldInlineTest(TestCase):
 
 @freeze_time('2017-01-01')
 class EventAdminTest(TestCase):
-    fixtures = ['members.json', 'committees.json']
+    fixtures = ['members.json', 'member_groups.json']
 
     @classmethod
     def setUpTestData(cls):

website/events/tests/test_api.py

@@ -16,7 +16,7 @@ from members.models import Member
 class RegistrationApiTest(TestCase):
     """Tests for registration view"""
 
-    fixtures = ['members.json', 'committees.json']
+    fixtures = ['members.json', 'member_groups.json']
 
     @classmethod
     def setUpTestData(cls):

website/events/tests/test_models.py

@@ -275,7 +275,7 @@ class EventTest(TestCase):
 class RegistrationTest(TestCase):
     """Tests event registrations"""
 
-    fixtures = ['members.json', 'committees.json']
+    fixtures = ['members.json', 'member_groups.json']
 
     @classmethod
     def setUpTestData(cls):

website/events/tests/test_services.py

@@ -15,7 +15,7 @@ from members.models import Member
 
 @freeze_time('2017-01-01')
 class ServicesTest(TestCase):
-    fixtures = ['members.json', 'committees.json']
+    fixtures = ['members.json', 'member_groups.json']
 
     @classmethod
     def setUpTestData(cls):

website/events/tests/test_views.py

@@ -18,7 +18,7 @@ from members.models import Member
 class AdminTest(TestCase):
     """Tests for admin views"""
 
-    fixtures = ['members.json', 'committees.json']
+    fixtures = ['members.json', 'member_groups.json']
 
     @classmethod
     def setUpTestData(cls):
@@ -130,7 +130,7 @@ class AdminTest(TestCase):
 class RegistrationTest(TestCase):
     """Tests for registration view"""
 
-    fixtures = ['members.json', 'committees.json']
+    fixtures = ['members.json', 'member_groups.json']
 
     @classmethod
     def setUpTestData(cls):

website/pizzas/tests.py

@@ -15,7 +15,7 @@ from pizzas.models import PizzaEvent
 @freeze_time('2018-03-21')
 class PizzaEventTestCase(TestCase):
     """Test the pizzaevent class"""
-    fixtures = ['members.json', 'committees.json']
+    fixtures = ['members.json', 'member_groups.json']
 
     @classmethod
     def setUpTestData(cls):