Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix some of the tests

Roland Geider7ba33e542e4b
diff --git a/wger/manager/fixtures/test-workout-data.json b/wger/manager/fixtures/test-workout-data.json
index 3793edcb1..2d3fbe01e 100644
--- a/wger/manager/fixtures/test-workout-data.json
+++ b/wger/manager/fixtures/test-workout-data.json
@@ -130,7 +130,8 @@
"comment": "",
"set": 1,
"reps": 8,
- "unit_id": 1,
+ "repetition_unit_id": 1,
+ "weight_unit_id": 1,
"weight": null,
"order": 1,
"exercise": 1
@@ -143,7 +144,8 @@
"comment": "",
"set": 2,
"reps": 10,
- "unit_id": 1,
+ "repetition_unit_id": 1,
+ "weight_unit_id": 1,
"weight": 15,
"order": 1,
"exercise": 2
@@ -156,7 +158,8 @@
"comment": "",
"set": 3,
"reps": 10,
- "unit_id": 1,
+ "repetition_unit_id": 1,
+ "weight_unit_id": 1,
"weight": null,
"order": 1,
"exercise": 2
diff --git a/wger/manager/tests/test_set.py b/wger/manager/tests/test_set.py
index 041183a25..413057b41 100644
--- a/wger/manager/tests/test_set.py
+++ b/wger/manager/tests/test_set.py
@@ -48,26 +48,34 @@ class SetAddTestCase(WorkoutManagerAddTestCase):
'exercise1-INITIAL_FORMS': 0,
'exercise1-MAX_NUM_FORMS': 1000,
'exercise1-0-reps': 10,
- 'exercise1-0-unit': 1,
+ 'exercise1-0-repetition_unit': 1,
+ 'exercise1-0-weight_unit': 1,
'exercise1-1-reps': 12,
- 'exercise1-1-unit': 1,
+ 'exercise1-1-repetition_unit': 1,
+ 'exercise1-1-weight_unit': 1,
'exercise1-2-reps': 10,
- 'exercise1-2-unit': 1,
+ 'exercise1-2-repetition_unit': 1,
+ 'exercise1-2-weight_unit': 1,
'exercise1-3-reps': 12,
- 'exercise1-3-unit': 1,
+ 'exercise1-3-repetition_unit': 1,
+ 'exercise1-3-weight_unit': 1,
}
data_ignore = ('exercise1-TOTAL_FORMS',
'exercise1-INITIAL_FORMS',
'exercise1-MAX_NUM_FORMS',
'exercise_list',
'exercise1-0-reps',
- 'exercise1-0-unit',
+ 'exercise1-0-repetition_unit',
+ 'exercise1-0-weight_unit',
'exercise1-1-reps',
- 'exercise1-1-unit',
+ 'exercise1-1-repetition_unit',
+ 'exercise1-1-weight_unit',
'exercise1-2-reps',
- 'exercise1-2-unit',
+ 'exercise1-2-repetition_unit',
+ 'exercise1-2-weight_unit',
'exercise1-3-reps',
- 'exercise1-3-unit')
+ 'exercise1-3-repetition_unit',
+ 'exercise1-3-weight_unit')
def test_add_set(self, fail=False):
'''
@@ -85,25 +93,33 @@ class SetAddTestCase(WorkoutManagerAddTestCase):
'exercise1-INITIAL_FORMS': 0,
'exercise1-MAX_NUM_FORMS': 1000,
'exercise1-0-reps': 10,
- 'exercise1-0-unit': 1,
+ 'exercise1-0-repetition_unit': 1,
+ 'exercise1-0-weight_unit': 1,
'exercise1-1-reps': 12,
- 'exercise1-1-unit': 1,
+ 'exercise1-1-repetition_unit': 1,
+ 'exercise1-1-weight_unit': 1,
'exercise1-2-reps': 10,
- 'exercise1-2-unit': 1,
+ 'exercise1-2-repetition_unit': 1,
+ 'exercise1-2-weight_unit': 1,
'exercise1-3-reps': 12,
- 'exercise1-3-unit': 1,
+ 'exercise1-3-repetition_unit': 1,
+ 'exercise1-3-weight_unit': 1,
'exercise2-TOTAL_FORMS': 4,
'exercise2-INITIAL_FORMS': 0,
'exercise2-MAX_NUM_FORMS': 1000,
'exercise2-0-reps': 8,
- 'exercise2-0-unit': 1,
+ 'exercise2-0-repetition_unit': 1,
+ 'exercise2-0-weight_unit': 1,
'exercise2-1-reps': 10,
- 'exercise2-1-unit': 2,
+ 'exercise2-1-repetition_unit': 2,
+ 'exercise2-1-weight_unit': 2,
'exercise2-2-reps': 8,
- 'exercise2-2-unit': 1,
+ 'exercise2-2-repetition_unit': 1,
+ 'exercise2-2-weight_unit': 1,
'exercise2-3-reps': 10,
- 'exercise2-3-unit': 2}
+ 'exercise2-3-repetition_unit': 2,
+ 'exercise2-3-weight_unit': 2}
response = self.client.post(reverse('manager:set:add', kwargs={'day_pk': 5}), post_data)
self.assertEqual(response.status_code, 302)
@@ -188,7 +204,8 @@ class TestSetOrderTestCase(WorkoutManagerTestCase):
post_data['exercise{0}-INITIAL_FORMS'.format(exercise_id)] = 0
post_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}-repetition_unit'.format(exercise_id, set_nr)] = 1
+ post_data['exercise{0}-{1}-weight_unit'.format(exercise_id, set_nr)] = 1
post_data['exercise{0}-{1}-reps'.format(exercise_id, set_nr)] = 8
response = self.client.post(reverse('manager:set:add', kwargs={'day_pk': 5}),
@@ -278,19 +295,23 @@ class SetEditEditTestCase(WorkoutManagerTestCase):
'exercise2-MAX_NUM_FORMS': 1000,
'exercise2-0-reps': 5,
'exercise2-0-id': 3,
- 'exercise2-0-unit': 1,
+ 'exercise2-0-repetition_unit': 1,
+ 'exercise2-0-weight_unit': 1,
'exercise2-0-DELETE': False,
'exercise2-1-reps': 13,
'exercise2-1-id': '',
- 'exercise2-1-unit': 1,
+ 'exercise2-1-repetition_unit': 1,
+ 'exercise2-1-weight_unit': 1,
'exercise2-2-DELETE': False,
'exercise2-2-reps': 13,
'exercise2-2-id': '',
- 'exercise2-2-unit': 1,
+ 'exercise2-2-repetition_unit': 1,
+ 'exercise2-2-weight_unit': 1,
'exercise2-2-DELETE': False,
'exercise2-3-reps': 13,
'exercise2-3-id': '',
- 'exercise2-3-unit': 1,
+ 'exercise2-3-repetition_unit': 1,
+ 'exercise2-3-weight_unit': 1,
'exercise2-3-DELETE': False})
entry_after = Set.objects.get(pk=3)
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index 917173032..7a1b2f667 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -192,7 +192,12 @@ class WeightLogOverviewAddTestCase(WorkoutManagerTestCase):
'time_end': datetime.time(12, 0),
'form-0-reps': 10,
'form-0-weight': 10,
- 'form-1-unit': 1,
+ 'form-0-repetition_unit': 1,
+ 'form-0-weight_unit': 1,
+ 'form-1-reps': 10,
+ 'form-1-weight': 10,
+ 'form-1-repetition_unit': 1,
+ 'form-1-weight_unit': 1,
'form-TOTAL_FORMS': 3,
'form-INITIAL_FORMS': 0,
'form-MAX-NUM_FORMS': 3
@@ -294,7 +299,8 @@ class WeightLogAddTestCase(WorkoutManagerAddTestCase):
url = reverse_lazy('manager:log:add', kwargs={'workout_pk': 1})
data = {'reps': 10,
'weight': 120.5,
- 'unit': 2,
+ 'repetition_unit': 2,
+ 'weight_unit': 1,
'date': datetime.date.today(),
'exercise': 1}
@@ -330,7 +336,8 @@ class WeightLogEntryEditTestCase(WorkoutManagerTestCase):
response = self.client.post(reverse('manager:log:edit', kwargs={'pk': 1}),
{'date': '2012-01-01',
'reps': 10,
- 'unit': 2,
+ 'repetition_unit': 2,
+ 'weight_unit': 3,
'weight': 10,
'exercise': 1
})
@@ -517,6 +524,7 @@ class WorkoutLogApiTestCase(api_base_test.ApiBaseResourceTestCase):
data = {"exercise": 1,
"workout": 3,
"reps": 3,
- "unit": 1,
+ "repetition_unit": 1,
+ "weight_unit": 2,
"weight": 2,
"date": datetime.date.today()}
diff --git a/wger/manager/tests/testcase.py b/wger/manager/tests/testcase.py
index 7fec0ef86..044688fe6 100644
--- a/wger/manager/tests/testcase.py
+++ b/wger/manager/tests/testcase.py
@@ -89,7 +89,8 @@ class BaseTestCase(object):
fixtures = ('days_of_week',
'gym_config',
'groups',
- 'repetition_units',
+ 'setting_repetition_units',
+ 'setting_weight_units',
'test-languages',
'test-licenses',
'test-gyms',
diff --git a/wger/tasks.py b/wger/tasks.py
index 14826d90f..4a33bc362 100644
--- a/wger/tasks.py
+++ b/wger/tasks.py
@@ -251,8 +251,8 @@ def load_fixtures(settings_path=None):
call_command("loaddata", path + "users.json")
call_command("loaddata", path + "licenses.json")
call_command("loaddata", path + "days_of_week.json")
- call_command("loaddata", path + "repetition_units.json")
- call_command("loaddata", path + "weight_units.json")
+ call_command("loaddata", path + "setting_repetition_units.json")
+ call_command("loaddata", path + "setting_weight_units.json")
# Config
path = os.path.join(current_dir, 'config', 'fixtures/')