Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add some tests for the workout timer view
Roland Geidere2bbd8f9e1ff
diff --git a/wger/manager/tests/test_timer.py b/wger/manager/tests/test_timer.pynew file mode 100644index 000000000..e7282f867--- /dev/null+++ b/wger/manager/tests/test_timer.py@@ -0,0 +1,99 @@+# This file is part of wger Workout Manager.+#+# wger Workout Manager is free software: you can redistribute it and/or modify+# it under the terms of the GNU Affero General Public License as published by+# the Free Software Foundation, either version 3 of the License, or+# (at your option) any later version.+#+# wger Workout Manager is distributed in the hope that it will be useful,+# but WITHOUT ANY WARRANTY; without even the implied warranty of+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+# GNU General Public License for more details.+#+# You should have received a copy of the GNU Affero General Public License++import logging+import math++from django.core.urlresolvers import reverse+from wger.exercises.models import Exercise++from wger.manager.tests.testcase import WorkoutManagerTestCase++logger = logging.getLogger('wger.custom')+++class WorkoutTimerTestCase(WorkoutManagerTestCase):+ '''+ Tests the timer view (gym mode) for a workout day+ '''++ def timer(self, fail=True):+ '''+ Helper function+ '''++ # Fetch the timer page+ response = self.client.get(reverse('workout-timer', kwargs={'day_pk': 2}))++ if fail:+ self.assertEqual(response.status_code, 404)+ else:+ self.assertEqual(response.status_code, 200)++ # Check some of the steps+ step_list = response.context['step_list']++ self.assertEqual(step_list[0]['exercise'], Exercise.objects.get(pk=2))+ self.assertEqual(step_list[0]['reps'], 10)+ self.assertEqual(step_list[0]['step_nr'], 1)+ self.assertEqual(math.floor(step_list[0]['step_percent']), 14)+ self.assertEqual(step_list[0]['type'], 'exercise')+ self.assertEqual(step_list[0]['weight'], '')++ self.assertEqual(step_list[1]['step_nr'], 2)+ self.assertEqual(math.floor(step_list[0]['step_percent']), 28)+ self.assertEqual(step_list[1]['time'], 90)+ self.assertEqual(step_list[1]['type'], 'pause')++ self.assertEqual(step_list[2]['exercise'], Exercise.objects.get(pk=2))+ self.assertEqual(step_list[2]['reps'], 10)+ self.assertEqual(step_list[2]['step_nr'], 3)+ self.assertEqual(math.floor(step_list[0]['step_percent']), 42)+ self.assertEqual(step_list[2]['type'], 'exercise')+ self.assertEqual(step_list[2]['weight'], '')++ self.assertEqual(step_list[3]['step_nr'], 4)+ self.assertEqual(math.floor(step_list[0]['step_percent']), 57)+ self.assertEqual(step_list[3]['time'], 90)+ self.assertEqual(step_list[3]['type'], 'pause')++ self.assertEqual(step_list[4]['exercise'], Exercise.objects.get(pk=2))+ self.assertEqual(step_list[4]['reps'], 10)+ self.assertEqual(step_list[4]['step_nr'], 5)+ self.assertEqual(math.floor(step_list[0]['step_percent']), 71)+ self.assertEqual(step_list[4]['type'], 'exercise')+ self.assertEqual(step_list[4]['weight'], '')++ def test_timer_anonymous(self):+ '''+ Tests the timer as an anonymous user+ '''++ self.timer(fail=True)++ def test_timer_owner(self):+ '''+ Tests the timer as the owner user+ '''++ self.user_login('test')+ self.timer(fail=True)++ def test_timer_other(self):+ '''+ Tests the timer as a logged user not owning the data+ '''++ self.user_login('admin')+ self.timer(fail=False)diff --git a/wger/manager/urls.py b/wger/manager/urls.pyindex 5a3ac6337..e64fa84c2 100644--- a/wger/manager/urls.py+++ b/wger/manager/urls.py@@ -87,7 +87,7 @@ urlpatterns = patterns('wger.manager.views',name='workout-ical'),# Timer- url(r'^workout/(?P<pk>\d+)/timer$',+ url(r'^workout/(?P<day_pk>\d+)/timer$','workout.timer',name='workout-timer'),diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.pyindex 23305944b..b7bd99ad9 100644--- a/wger/manager/views/workout.py+++ b/wger/manager/views/workout.py@@ -256,12 +256,13 @@ def get_last_weight(user, exercise, reps):@login_required-def timer(request, pk):+def timer(request, day_pk):'''The timer view ("gym mode") for a workout'''- day = Day.objects.get(pk=pk, training__user=request.user)+ day = get_object_or_404(Day, pk=day_pk, training__user=request.user)+ #day = Day.objects.get(pk=day_pk, training__user=request.user)canonical_day = day.canonical_representationcontext = {}step_list = []@@ -318,7 +319,7 @@ def timer(request, pk):# Go through the page list and calculate the correct value for step_percentfor i, s in enumerate(step_list):- step_list[i]['step_percent'] = (i + 1) * 100.0 / len(step_list),+ step_list[i]['step_percent'] = (i + 1) * 100.0 / len(step_list)# Render templatecontext['day'] = day