Self hosted FLOSS fitness/workout, nutrition and weight tracker
Fix tests so they run with the set units
Roland Geider0307bc585213
diff --git a/wger/manager/helpers.py b/wger/manager/helpers.pyindex 864c5e8ea..6bab6280f 100644--- a/wger/manager/helpers.py+++ b/wger/manager/helpers.py@@ -159,8 +159,8 @@ def reps_smart_text(settings, set_obj):elif len(settings) == 1:reps = settings[0].reps if settings[0].reps != 99 else u'∞'rep_unit = settings[0].unit.name if settings[0].unit.id != 1 else ''- setting_text = u'{0} × {1} {2}'.format(set_obj.sets, reps, rep_unit)- setting_list_text = u'{0} {1}'.format(reps, rep_unit)+ setting_text = u'{0} × {1} {2}'.format(set_obj.sets, reps, rep_unit).strip()+ setting_list_text = u'{0} {1}'.format(reps, rep_unit).strip()# The weight can be None, or a decimal. In that case, normalize so# that we don't return e.g. '15.00', but always '15', independently of@@ -187,7 +187,7 @@ def reps_smart_text(settings, set_obj):tmp_unit = []for i in settings:rep_unit = i.unit.name if i.unit.id != 1 else ''- reps = "{0} {1}".format(i.reps, rep_unit) if i.reps != 99 else u'∞'+ reps = "{0} {1}".format(i.reps, rep_unit).strip() if i.reps != 99 else u'∞'weight = i.weightif i.weight:diff --git a/wger/manager/tests/test_set.py b/wger/manager/tests/test_set.pyindex 6ef82448b..041183a25 100644--- a/wger/manager/tests/test_set.py+++ b/wger/manager/tests/test_set.py@@ -46,11 +46,28 @@ class SetAddTestCase(WorkoutManagerAddTestCase):'sets': 4,'exercise1-TOTAL_FORMS': 4,'exercise1-INITIAL_FORMS': 0,- 'exercise1-MAX_NUM_FORMS': 1000}+ 'exercise1-MAX_NUM_FORMS': 1000,+ 'exercise1-0-reps': 10,+ 'exercise1-0-unit': 1,+ 'exercise1-1-reps': 12,+ 'exercise1-1-unit': 1,+ 'exercise1-2-reps': 10,+ 'exercise1-2-unit': 1,+ 'exercise1-3-reps': 12,+ 'exercise1-3-unit': 1,+ }data_ignore = ('exercise1-TOTAL_FORMS','exercise1-INITIAL_FORMS','exercise1-MAX_NUM_FORMS',- 'exercise_list')+ 'exercise_list',+ 'exercise1-0-reps',+ 'exercise1-0-unit',+ 'exercise1-1-reps',+ 'exercise1-1-unit',+ 'exercise1-2-reps',+ 'exercise1-2-unit',+ 'exercise1-3-reps',+ 'exercise1-3-unit')def test_add_set(self, fail=False):'''@@ -63,17 +80,30 @@ class SetAddTestCase(WorkoutManagerAddTestCase):post_data = {'exercises': exercises_id,'exercise_list': 1, # Only for mobile version'sets': 4,+'exercise1-TOTAL_FORMS': 4,'exercise1-INITIAL_FORMS': 0,'exercise1-MAX_NUM_FORMS': 1000,'exercise1-0-reps': 10,+ 'exercise1-0-unit': 1,'exercise1-1-reps': 12,+ 'exercise1-1-unit': 1,'exercise1-2-reps': 10,+ 'exercise1-2-unit': 1,'exercise1-3-reps': 12,+ 'exercise1-3-unit': 1,+'exercise2-TOTAL_FORMS': 4,'exercise2-INITIAL_FORMS': 0,'exercise2-MAX_NUM_FORMS': 1000,- 'exercise2-0-reps': 8}+ 'exercise2-0-reps': 8,+ 'exercise2-0-unit': 1,+ 'exercise2-1-reps': 10,+ 'exercise2-1-unit': 2,+ 'exercise2-2-reps': 8,+ 'exercise2-2-unit': 1,+ 'exercise2-3-reps': 10,+ 'exercise2-3-unit': 2}response = self.client.post(reverse('manager:set:add', kwargs={'day_pk': 5}), post_data)self.assertEqual(response.status_code, 302)@@ -89,7 +119,7 @@ class SetAddTestCase(WorkoutManagerAddTestCase):if setting.exercise == exercise1:self.assertIn(setting.reps, (10, 12))else:- self.assertEqual(setting.reps, 8)+ self.assertIn(setting.reps, (8, 10))class SetDeleteTestCase(WorkoutManagerTestCase):@@ -151,12 +181,15 @@ class TestSetOrderTestCase(WorkoutManagerTestCase):'''nr_sets = 4post_data = {'exercises': exercises_id,- 'exercise_list': exercises_id[0], # Only for mobile version+ 'exercise_list': exercises_id[0], # Only for mobile version,'sets': nr_sets}for exercise_id in exercises_id:post_data['exercise{0}-TOTAL_FORMS'.format(exercise_id)] = nr_setspost_data['exercise{0}-INITIAL_FORMS'.format(exercise_id)] = 0post_data['exercise{0}-MAX_NUM_FORMS'.format(exercise_id)] = 1000+ for set_nr in range(0, nr_sets):+ post_data['exercise{0}-{1}-unit'.format(exercise_id, set_nr)] = 1+ post_data['exercise{0}-{1}-reps'.format(exercise_id, set_nr)] = 8response = self.client.post(reverse('manager:set:add', kwargs={'day_pk': 5}),post_data)@@ -245,10 +278,20 @@ class SetEditEditTestCase(WorkoutManagerTestCase):'exercise2-MAX_NUM_FORMS': 1000,'exercise2-0-reps': 5,'exercise2-0-id': 3,+ 'exercise2-0-unit': 1,'exercise2-0-DELETE': False,'exercise2-1-reps': 13,'exercise2-1-id': '',- 'exercise2-1-DELETE': False})+ 'exercise2-1-unit': 1,+ 'exercise2-2-DELETE': False,+ 'exercise2-2-reps': 13,+ 'exercise2-2-id': '',+ 'exercise2-2-unit': 1,+ 'exercise2-2-DELETE': False,+ 'exercise2-3-reps': 13,+ 'exercise2-3-id': '',+ 'exercise2-3-unit': 1,+ 'exercise2-3-DELETE': False})entry_after = Set.objects.get(pk=3)