diff --git a/ohlhafv/static/ohlhafv/img/heevit.svg b/ohlhafv/static/ohlhafv/img/heevit.svg index f711e47..1f49076 100644 --- a/ohlhafv/static/ohlhafv/img/heevit.svg +++ b/ohlhafv/static/ohlhafv/img/heevit.svg @@ -1,473 +1,3016 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/webapp/tests/test_contact.py b/webapp/tests/test_contact.py index 747fbf7..a153c58 100644 --- a/webapp/tests/test_contact.py +++ b/webapp/tests/test_contact.py @@ -62,29 +62,31 @@ def createPerson(name): class ContactsTestCase(APITestCase): + current_year = timezone.now().year + old_year = 1970 def setUp(self): - createOccupation(timezone.now().year, role=createRoleBoard(), dummydata=1) - createOccupation(timezone.now().year, dummydata=2) - createOccupation(1970, role=createRoleBoard(), dummydata=3) - createOccupation(1970, dummydata=4) + createOccupation(self.current_year, role=createRoleBoard(), dummydata=1) + createOccupation(self.current_year, dummydata=2) + createOccupation(self.old_year, role=createRoleBoard(), dummydata=3) + createOccupation(self.old_year, dummydata=4) def test_get(self): response = self.client.get(f"{URL}", format='json') self.assertEqual(response.status_code, status.HTTP_200_OK) serializer = OccupationSerializer( - Occupation.by_year(2019), + Occupation.by_year(self.current_year), many=True ) self.assertEqual(response.data["results"], serializer.data) def test_get_by_year(self): - response = self.client.get(f"{URL}?year=1970", format='json') + response = self.client.get(f"{URL}?year={self.old_year}", format='json') self.assertEqual(response.status_code, status.HTTP_200_OK) serializer = OccupationSerializer( - Occupation.by_year(1970), + Occupation.by_year(self.old_year), many=True )