Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge remote-tracking branch 'wger-project/master'

Tony1c526abc8d47
diff --cc wger/manager/tests/test_workout_canonical.py
index 97c27c4bb,608083f8a..632147fa3
--- a/wger/manager/tests/test_workout_canonical.py
+++ b/wger/manager/tests/test_workout_canonical.py
@@@ -71,9 -73,12 +73,12 @@@ class WorkoutCanonicalFormTestCase(Wger
'front': [muscle1]},
'obj': Day.objects.get(pk=1),
'set_list': [{'exercise_list': [{'obj': Exercise.objects.get(pk=1),
+ 'image_list': [
+ {'image': image1, 'is_main': True},
+ {'image': image2, 'is_main': False}],
'comment_list': ['test 123'],
'has_weight': False,
- 'setting_list': ['8', '8'],
+ 'setting_list': ['8 (5)', '8 (5)'],
'reps_list': [8, 8],
'weight_list': [None, None],
'setting_obj_list': [setting_1],