Self hosted FLOSS fitness/workout, nutrition and weight tracker
Update gym tests to test multiple users
Roland Geider4d5676fa8ea4
diff --git a/wger/gym/tests/test_config.py b/wger/gym/tests/test_config.pyindex 49db8f31b..2cc79c1cf 100644--- a/wger/gym/tests/test_config.py+++ b/wger/gym/tests/test_config.py@@ -27,3 +27,13 @@ class EditGymConfigTestCase(WorkoutManagerEditTestCase):object_class = GymConfigurl = 'gym:config:edit'data = {'weeks_inactive': 10}+ user_success = ('admin',+ 'manager1',+ 'manager2')+ user_fail = ('member1',+ 'general_manager1',+ 'trainer1',+ 'trainer2',+ 'trainer3',+ 'trainer4',+ 'manager3')diff --git a/wger/gym/tests/test_gym.py b/wger/gym/tests/test_gym.pyindex 9bb59d82d..14542fed9 100644--- a/wger/gym/tests/test_gym.py+++ b/wger/gym/tests/test_gym.py@@ -29,6 +29,14 @@ class GymOverviewTest(WorkoutManagerAccessTestCase):'''url = 'gym:gym:list'anonymous_fail = True+ user_success = ('admin',+ 'general_manager1')+ user_fail = ('member1',+ 'member2',+ 'trainer2',+ 'trainer3',+ 'trainer4',+ 'manager3')class GymUserOverviewTest(WorkoutManagerAccessTestCase):@@ -37,16 +45,34 @@ class GymUserOverviewTest(WorkoutManagerAccessTestCase):'''url = reverse_lazy('gym:gym:user-list', kwargs={'pk': 1})anonymous_fail = True+ user_success = ('admin',+ 'trainer2',+ 'trainer3',+ 'manager1',+ 'general_manager1')+ user_fail = ('member1',+ 'member2',+ 'trainer4',+ 'manager3')class AddGymTestCase(WorkoutManagerAddTestCase):'''Tests adding a new gym'''+ pk = 4object_class = Gymurl = 'gym:gym:add'data = {'name': 'The name here'}- pk = 4+ user_success = ('admin',+ 'general_manager1')+ user_fail = ('member1',+ 'member2',+ 'trainer2',+ 'trainer3',+ 'trainer4',+ 'manager1',+ 'manager3')class DeleteGymTestCase(WorkoutManagerDeleteTestCase):@@ -54,9 +80,9 @@ class DeleteGymTestCase(WorkoutManagerDeleteTestCase):Tests deleting a gym'''+ pk = 2object_class = Gymurl = 'gym:gym:delete'- pk = 2class EditGymTestCase(WorkoutManagerEditTestCase):@@ -68,6 +94,15 @@ class EditGymTestCase(WorkoutManagerEditTestCase):url = 'gym:gym:edit'pk = 1data = {'name': 'A different name'}+ user_success = ('admin',+ 'manager1',+ 'general_manager1')+ user_fail = ('member1',+ 'member2',+ 'trainer2',+ 'trainer3',+ 'trainer4',+ 'manager3')class GymTestCase(WorkoutManagerTestCase):diff --git a/wger/gym/tests/test_user_config.py b/wger/gym/tests/test_user_config.pyindex a9115fef6..7c5ea768d 100644--- a/wger/gym/tests/test_user_config.py+++ b/wger/gym/tests/test_user_config.py@@ -19,12 +19,22 @@ from wger.gym.models import GymUserConfigclass EditConfigTestCase(WorkoutManagerEditTestCase):'''- Tests editing an admin config+ Tests editing a user config'''+ pk = 1object_class = GymUserConfigurl = 'gym:user_config:edit'- pk = 1user_success = 'trainer1'user_fail = 'member1'+ user_success = ('trainer1',+ 'trainer2',+ 'trainer3',+ 'admin')+ user_fail = ('general_manager1'+ 'member1',+ 'member2',+ 'trainer4',+ 'manager3')+data = {'include_inactive': False}diff --git a/wger/gym/views/user_config.py b/wger/gym/views/user_config.pyindex a2059a08e..7f8c67a3b 100644--- a/wger/gym/views/user_config.py+++ b/wger/gym/views/user_config.py@@ -16,6 +16,7 @@import loggingfrom django.core.urlresolvers import reverse+from django.http import HttpResponseForbiddenfrom django.utils.translation import ugettext as _from django.views.generic import UpdateView@@ -34,6 +35,20 @@ class ConfigUpdateView(WgerFormMixin, UpdateView):model = GymUserConfigpermission_required = 'gym.change_gymuserconfig'+ def dispatch(self, request, *args, **kwargs):+ '''+ Only managers for this gym can edit the user settings+ '''++ if not request.user.is_authenticated():+ return HttpResponseForbidden()++ config = self.get_object()+ gym_id = request.user.userprofile.gym_id+ if gym_id != config.gym.pk:+ return HttpResponseForbidden()+ return super(ConfigUpdateView, self).dispatch(request, *args, **kwargs)+def get_success_url(self):'''Return to the gym user overview