Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge branch 'master' of https://github.com/alokhan/wger

Roland Geider051337e1b78c
diff --cc wger/manager/tests/test_workout_canonical.py
index bd15b928b,69129c4a9..0132dd652
--- a/wger/manager/tests/test_workout_canonical.py
+++ b/wger/manager/tests/test_workout_canonical.py
@@@ -47,9 -41,8 +47,10 @@@ class WorkoutCanonicalFormTestCase(Work
workout = Workout.objects.get(pk=1)
setting_1 = Setting.objects.get(pk=1)
setting_2 = Setting.objects.get(pk=2)
+ repetition_unit = RepetitionUnit.objects.get(pk=1)
+ weight_unit = WeightUnit.objects.get(pk=1)
- self.assertEqual(workout.canonical_representation['muscles'], {'back': [2], 'front': [1]})
+ self.assertEqual(workout.canonical_representation['muscles'],
+ {'back': [2], 'frontsecondary': [1], 'backsecondary': [1], 'front': [1]})
self.assertEqual(workout.canonical_representation['obj'], workout)
canonical_form = {'days_of_week': {'day_list': [DaysOfWeek.objects.get(pk=2)],
@@@ -63,14 -59,12 +67,16 @@@
'reps_list': [8, 8],
'weight_list': [None, None],
'setting_obj_list': [setting_1],
- 'setting_text': u'2 \xd7 8'}],
+ 'setting_text': u'2 \xd7 8',
+ 'repetition_units': [repetition_unit,
+ repetition_unit],
+ 'weight_units': [weight_unit,
+ weight_unit]}],
'is_superset': False,
'has_settings': True,
- 'muscles': {'back': [2], 'front': [1]},
+ 'muscles': {'back': [2], 'frontsecondary': [],
+ 'backsecondary': [],
+ 'front': [1]},
'obj': Set.objects.get(pk=1)}]}
self.assertEqual(workout.canonical_representation['day_list'][0], canonical_form)
@@@ -82,24 -78,18 +90,26 @@@
'comment_list': [u'Foobar'],
'has_weight': True,
'reps_list': [10, 10, 10, 10],
- 'setting_list': [u'10 (15kg)',
- u'10 (15kg)',
- u'10 (15kg)',
- u'10 (15kg)'],
+ 'setting_list': [u'10 (15 kg)',
+ u'10 (15 kg)',
+ u'10 (15 kg)',
+ u'10 (15 kg)'],
'weight_list': [Decimal(15)] * 4,
'setting_obj_list': [setting_2],
- 'setting_text': u'4 \xd7 10 (15kg)'}],
+ 'setting_text': u'4 \xd7 10 (15 kg)',
+ 'repetition_units': [repetition_unit,
+ repetition_unit,
+ repetition_unit,
+ repetition_unit],
+ 'weight_units': [weight_unit,
+ weight_unit,
+ weight_unit,
+ weight_unit]}],
'is_superset': False,
'has_settings': True,
- 'muscles': {'back': [2], 'front': []},
+ 'muscles': {'back': [2],
+ 'frontsecondary': [1], 'backsecondary': [1],
+ 'front': []},
'obj': Set.objects.get(pk=2)}]}
self.assertEqual(workout.canonical_representation['day_list'][1], canonical_form)
@@@ -118,11 -109,10 +129,12 @@@
day = Day.objects.get(pk=5)
weekday1 = DaysOfWeek.objects.get(pk=3)
weekday2 = DaysOfWeek.objects.get(pk=5)
+ repetition_unit = RepetitionUnit.objects.get(pk=1)
+ weight_unit = WeightUnit.objects.get(pk=1)
self.assertEqual(day.canonical_representation['days_of_week'],
{'day_list': [weekday1, weekday2], 'text': u'Wednesday, Friday'})
- self.assertEqual(day.canonical_representation['muscles'], {'back': [2], 'front': []})
+ self.assertEqual(day.canonical_representation['muscles'],
+ {'back': [2], 'frontsecondary': [1], 'backsecondary': [1], 'front': []})
self.assertEqual(day.canonical_representation['obj'], day)
canonical_form = [{'exercise_list': [{'obj': Exercise.objects.get(pk=2),
@@@ -132,18 -122,11 +144,19 @@@
'setting_list': [u'10', u'10', u'10', u'10'],
'weight_list': [None, None, None, None],
'setting_obj_list': [Setting.objects.get(pk=3)],
- 'setting_text': u'4 \xd7 10'}],
+ 'setting_text': u'4 \xd7 10',
+ 'repetition_units': [repetition_unit,
+ repetition_unit,
+ repetition_unit,
+ repetition_unit],
+ 'weight_units': [weight_unit,
+ weight_unit,
+ weight_unit,
+ weight_unit]}],
'is_superset': False,
'has_settings': True,
- 'muscles': {'back': [2], 'front': []},
+ 'muscles': {'back': [2], 'frontsecondary': [1],
+ 'backsecondary': [1], 'front': []},
'obj': Set.objects.get(pk=3)}]
self.assertEqual(day.canonical_representation['set_list'], canonical_form)