Self hosted FLOSS fitness/workout, nutrition and weight tracker
Dynamically add test methods for the delete tests
Roland Geider9bea0b19794d
diff --git a/wger/gym/tests/test_admin_user_notes.py b/wger/gym/tests/test_admin_user_notes.pyindex 1c28e40ee..679171ede 100644--- a/wger/gym/tests/test_admin_user_notes.py+++ b/wger/gym/tests/test_admin_user_notes.py@@ -14,6 +14,7 @@from django.core.urlresolvers import reverse_lazy+from wger.manager.tests.testcase import delete_testcase_add_methodsfrom wger.manager.tests.testcase import WorkoutManagerAccessTestCasefrom wger.manager.tests.testcase import WorkoutManagerAddTestCasefrom wger.manager.tests.testcase import WorkoutManagerDeleteTestCase@@ -85,13 +86,14 @@ class DeleteAdminNoteTestCase(WorkoutManagerDeleteTestCase):pk = 2object_class = AdminUserNoteurl = 'gym:admin_note:delete'- user_success = 'trainer1'- # user_success = ('trainer1',- # 'trainer2',- # 'trainer3')+ user_success = ('trainer1',+ 'trainer2',+ 'trainer3')user_fail = ('member1','manager1','manager2','trainer4','general_manager1','general_manager2')++delete_testcase_add_methods(DeleteAdminNoteTestCase)diff --git a/wger/gym/tests/test_gym.py b/wger/gym/tests/test_gym.pyindex 0df1e380e..2eba1c576 100644--- a/wger/gym/tests/test_gym.py+++ b/wger/gym/tests/test_gym.py@@ -16,6 +16,7 @@ from django.core.urlresolvers import reverse_lazyfrom wger.core.models import UserProfilefrom wger.gym.models import Gym+from wger.manager.tests.testcase import delete_testcase_add_methodsfrom wger.manager.tests.testcase import WorkoutManagerTestCasefrom wger.manager.tests.testcase import WorkoutManagerAccessTestCasefrom wger.manager.tests.testcase import WorkoutManagerDeleteTestCase@@ -84,6 +85,18 @@ class DeleteGymTestCase(WorkoutManagerDeleteTestCase):pk = 2object_class = Gymurl = 'gym:gym:delete'+ user_success = ('admin',+ 'general_manager1',+ 'general_manager2')+ user_fail = ('member1',+ 'member2',+ 'trainer2',+ 'trainer3',+ 'trainer4',+ 'manager1',+ 'manager3')++delete_testcase_add_methods(DeleteGymTestCase)class EditGymTestCase(WorkoutManagerEditTestCase):diff --git a/wger/manager/tests/testcase.py b/wger/manager/tests/testcase.pyindex 96291dfa6..af7abe99d 100644--- a/wger/manager/tests/testcase.py+++ b/wger/manager/tests/testcase.py@@ -52,6 +52,30 @@ def get_user_list(users):return [users]+def delete_testcase_add_methods(cls):+ '''+ Helper function that dynamically adds test methods.++ This is a bit of a hack, but it's the easiest way of making sure that+ all the setup and teardown work is performed for each test user (and,+ most importantly for us, that the database is reseted every time).++ This must be called if the testcase has more than one success user+ '''++ for user in get_user_list(cls.user_fail):+ def test_unauthorized(self):+ self.user_login(user)+ self.delete_object(fail=False)+ setattr(cls, 'test_unauthorized_{0}'.format(user), test_unauthorized)++ for user in get_user_list(cls.user_success):+ def test_authorized(self):+ self.user_login(user)+ self.delete_object(fail=False)+ setattr(cls, 'test_authorized_{0}'.format(user), test_authorized)++class BaseTestCase(object):'''Base test case.@@ -193,9 +217,9 @@ class WorkoutManagerDeleteTestCase(WorkoutManagerTestCase):GET will only show a confirmation dialog.'''- object_class = ''- url = ''pk = None+ url = ''+ object_class = ''def delete_object(self, fail=False):'''@@ -241,24 +265,21 @@ class WorkoutManagerDeleteTestCase(WorkoutManagerTestCase):'''Tests deleting the object as an anonymous user'''-self.delete_object(fail=True)def test_delete_object_authorized(self):'''- Tests deleting the object as the authorized users+ Tests deleting the object as the authorized user'''-- for user in get_user_list(self.user_success):- self.user_login(user)+ if not isinstance(self.user_success, tuple):+ self.user_login(self.user_success)self.delete_object(fail=False)def test_delete_object_other(self):'''Tests deleting the object as the unauthorized, logged in users'''-- if self.user_fail:+ if self.user_fail and not isinstance(self.user_success, tuple):for user in get_user_list(self.user_fail):self.user_login(user)self.delete_object(fail=True)