From 6ddce00afc0ed78f170d09ead0fe8206cde69025 Mon Sep 17 00:00:00 2001 From: Kelvin Muchiri Date: Thu, 16 Jan 2025 15:11:53 +0300 Subject: [PATCH] refactor tests --- onadata/apps/api/tests/viewsets/test_abstract_viewset.py | 8 ++++++++ onadata/libs/tests/utils/test_logger_tools.py | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/onadata/apps/api/tests/viewsets/test_abstract_viewset.py b/onadata/apps/api/tests/viewsets/test_abstract_viewset.py index ec9907fc57..d49bd1d324 100644 --- a/onadata/apps/api/tests/viewsets/test_abstract_viewset.py +++ b/onadata/apps/api/tests/viewsets/test_abstract_viewset.py @@ -141,6 +141,14 @@ def setUp(self): sender=DataDictionary, dispatch_uid="create_export_repeat_register" ) + def tearDown(self): + TestCase.tearDown(self) + + # Enable signals + post_save.connect( + sender=DataDictionary, dispatch_uid="create_export_repeat_register" + ) + def user_profile_data(self): """Returns the user profile python object.""" return { diff --git a/onadata/libs/tests/utils/test_logger_tools.py b/onadata/libs/tests/utils/test_logger_tools.py index 791e52973b..f4c84d2767 100644 --- a/onadata/libs/tests/utils/test_logger_tools.py +++ b/onadata/libs/tests/utils/test_logger_tools.py @@ -1168,6 +1168,7 @@ def setUp(self): # Disable signals post_save.disconnect(sender=Instance, dispatch_uid="register_export_repeats") + self.project = get_user_default_project(self.user) md = """ | survey | @@ -1215,11 +1216,10 @@ def setUp(self): self.instance = Instance.objects.create( xml=self.xml, user=self.user, xform=self.xform ) - self.register, _ = MetaData.objects.get_or_create( + self.register = MetaData.objects.get( data_type="export_repeat_register", object_id=self.xform.pk, content_type=ContentType.objects.get_for_model(self.xform), - defaults={"data_value": ""}, ) def test_repeat_register_not_found(self): @@ -1340,6 +1340,7 @@ def setUp(self): # Disable signals post_save.disconnect(sender=Instance, dispatch_uid="register_export_repeats") + self.project = get_user_default_project(self.user) md = """ | survey | @@ -1387,11 +1388,10 @@ def setUp(self): self.instance = Instance.objects.create( xml=xml, user=self.user, xform=self.xform ) - self.register, _ = MetaData.objects.get_or_create( + self.register = MetaData.objects.get( data_type="export_repeat_register", object_id=self.xform.pk, content_type=ContentType.objects.get_for_model(self.xform), - defaults={"data_value": ""}, ) def test_register(self):