Self hosted FLOSS fitness/workout, nutrition and weight tracker
decimal field in RPE
Tonyd31abf5ce6ee
diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.pyindex 632147fa3..1eb6945ca 100644--- a/wger/manager/tests/test_workout_canonical.py+++ b/wger/manager/tests/test_workout_canonical.py@@ -78,11 +78,12 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):{'image': image2, 'is_main': False}],'comment_list': ['test 123'],'has_weight': False,- 'setting_list': ['8 (5)', '8 (5)'],+ 'setting_list': ['8 (5 RPE)',+ '8 (5 RPE)'],'reps_list': [8, 8],'weight_list': [None, None],'setting_obj_list': [setting_1],- 'setting_text': '2 \xd7 8 (5)',+ 'setting_text': '2 \xd7 8 (5 RPE)','repetition_units': [repetition_unit,repetition_unit],'weight_units': [weight_unit,@@ -124,13 +125,13 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):'comment_list': ['Foobar'],'has_weight': True,'reps_list': [10, 10, 10, 10],- 'setting_list': ['10 (5) (15 kg)',- '10 (5) (15 kg)',- '10 (5) (15 kg)',- '10 (5) (15 kg)'],+ 'setting_list': ['10 (15 kg, 5 RPE)',+ '10 (15 kg, 5 RPE)',+ '10 (15 kg, 5 RPE)',+ '10 (15 kg, 5 RPE)'],'weight_list': [Decimal(15)] * 4,'setting_obj_list': [setting_2],- 'setting_text': '4 \xd7 10 (5) (15 kg)',+ 'setting_text': '4 \xd7 10 (15 kg, 5 RPE)','repetition_units': [repetition_unit,repetition_unit,repetition_unit,@@ -200,11 +201,11 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):'comment_list': ['Foobar'],'reps_list': [10, 10, 10, 10],'has_weight': False,- 'setting_list': ['10 (5)', '10 (5)', '10 (5)',- '10 (5)'],+ 'setting_list': ['10 (5 RPE)', '10 (5 RPE)',+ '10 (5 RPE)', '10 (5 RPE)'],'weight_list': [None, None, None, None],'setting_obj_list': [Setting.objects.get(pk=3)],- 'setting_text': '4 \xd7 10 (5)',+ 'setting_text': '4 \xd7 10 (5 RPE)','repetition_units': [repetition_unit,repetition_unit,repetition_unit,