Self hosted FLOSS fitness/workout, nutrition and weight tracker
Don't hard code the PK of objects in add-tests
Roland Geiderbfff4712b2d1
diff --git a/wger/core/tests/test_language.py b/wger/core/tests/test_language.pyindex 2eb41470e..f90b661d5 100644--- a/wger/core/tests/test_language.py+++ b/wger/core/tests/test_language.py@@ -50,7 +50,6 @@ class CreateLanguageTestCase(WorkoutManagerAddTestCase):object_class = Languageurl = 'config:language-add'- pk = 3data = {'short_name': 'dk','full_name': 'Dansk'}diff --git a/wger/core/tests/test_license.py b/wger/core/tests/test_license.pyindex 1c9c11acf..d97bb4165 100644--- a/wger/core/tests/test_license.py+++ b/wger/core/tests/test_license.py@@ -40,7 +40,6 @@ class AddLicenseTestCase(WorkoutManagerAddTestCase):url = 'core:license-add'data = {'full_name': 'Something here','short_name': 'SH'}- pk = 3class DeleteLicenseTestCase(WorkoutManagerDeleteTestCase):diff --git a/wger/exercises/tests/test_categories.py b/wger/exercises/tests/test_categories.pyindex bffd03f29..5b02f5f48 100644--- a/wger/exercises/tests/test_categories.py+++ b/wger/exercises/tests/test_categories.py@@ -55,7 +55,6 @@ class AddExerciseCategoryTestCase(WorkoutManagerAddTestCase):object_class = ExerciseCategoryurl = 'exercisecategory-add'- pk = 5data = {'name': 'A new category'}diff --git a/wger/exercises/tests/test_equipment.py b/wger/exercises/tests/test_equipment.pyindex 6d1328fbb..4b3aa68f9 100644--- a/wger/exercises/tests/test_equipment.py+++ b/wger/exercises/tests/test_equipment.py@@ -37,7 +37,6 @@ class AddEquipmentTestCase(WorkoutManagerAddTestCase):object_class = Equipmenturl = 'equipment-add'data = {'name': 'A new equipment'}- pk = 4class DeleteEquipmentTestCase(WorkoutManagerDeleteTestCase):diff --git a/wger/exercises/tests/test_exercise_comments.py b/wger/exercises/tests/test_exercise_comments.pyindex 33b5e8a13..2a0924603 100644--- a/wger/exercises/tests/test_exercise_comments.py+++ b/wger/exercises/tests/test_exercise_comments.py@@ -33,7 +33,6 @@ class AddExerciseCommentTestCase(WorkoutManagerAddTestCase):object_class = ExerciseCommenturl = reverse('exercisecomment-add', kwargs={'exercise_pk': 1})- pk = 3user_fail = Falsedata = {'comment': 'a new cool comment'}diff --git a/wger/exercises/tests/test_exercise_images.py b/wger/exercises/tests/test_exercise_images.pyindex b9571ce2c..bc1c151f2 100644--- a/wger/exercises/tests/test_exercise_images.py+++ b/wger/exercises/tests/test_exercise_images.py@@ -109,7 +109,6 @@ class AddExerciseImageTestCase(WorkoutManagerAddTestCase):object_class = ExerciseImageurl = reverse('exerciseimage-add', kwargs={'exercise_pk': 1})- pk = 4user_fail = Falsedata = {'is_main': True,'image': open('wger/exercises/tests/protestschwein.jpg', 'rb'),diff --git a/wger/exercises/tests/test_muscles.py b/wger/exercises/tests/test_muscles.pyindex d64a878c0..d8b2fb144 100644--- a/wger/exercises/tests/test_muscles.py+++ b/wger/exercises/tests/test_muscles.py@@ -33,7 +33,6 @@ class AddMuscleTestCase(WorkoutManagerAddTestCase):object_class = Muscleurl = 'muscle-add'- pk = 4data = {'name': 'A new muscle','is_front': True}diff --git a/wger/gym/tests/test_admin_user_notes.py b/wger/gym/tests/test_admin_user_notes.pyindex 14f1b4577..1c28e40ee 100644--- a/wger/gym/tests/test_admin_user_notes.py+++ b/wger/gym/tests/test_admin_user_notes.py@@ -43,7 +43,6 @@ class AddAdminNoteTestCase(WorkoutManagerAddTestCase):'''Tests adding a new gym'''- pk = 3object_class = AdminUserNoteurl = reverse_lazy('gym:admin_note:add', kwargs={'user_pk': 14})data = {'note': 'The note text goes here'}diff --git a/wger/gym/tests/test_gym.py b/wger/gym/tests/test_gym.pyindex 3b1ddc289..0df1e380e 100644--- a/wger/gym/tests/test_gym.py+++ b/wger/gym/tests/test_gym.py@@ -62,7 +62,6 @@ class AddGymTestCase(WorkoutManagerAddTestCase):'''Tests adding a new gym'''- pk = 4object_class = Gymurl = 'gym:gym:add'data = {'name': 'The name here'}diff --git a/wger/manager/tests/test_day.py b/wger/manager/tests/test_day.pyindex 32c8cbb8a..0febd01cd 100644--- a/wger/manager/tests/test_day.py+++ b/wger/manager/tests/test_day.py@@ -30,7 +30,6 @@ class AddWorkoutDayTestCase(WorkoutManagerAddTestCase):object_class = Dayurl = reverse('day-add', kwargs={'workout_pk': 3})- pk = 6user_success = 'test'user_fail = 'admin'data = {'description': 'a new day',diff --git a/wger/manager/tests/test_schedule.py b/wger/manager/tests/test_schedule.pyindex e6aa60ad7..9f333c0e5 100644--- a/wger/manager/tests/test_schedule.py+++ b/wger/manager/tests/test_schedule.py@@ -39,7 +39,6 @@ class CreateScheduleTestCase(WorkoutManagerAddTestCase):object_class = Scheduleurl = 'schedule-add'- pk = 5user_success = 'test'user_fail = Falsedata = {'name': 'My cool schedule',diff --git a/wger/manager/tests/test_schedule_step.py b/wger/manager/tests/test_schedule_step.pyindex 3b4230b7c..f72da2153 100644--- a/wger/manager/tests/test_schedule_step.py+++ b/wger/manager/tests/test_schedule_step.py@@ -28,7 +28,6 @@ class CreateScheduleStepTestCase(WorkoutManagerAddTestCase):object_class = ScheduleStepurl = reverse_lazy('step-add', kwargs={'schedule_pk': 1})- pk = 5user_success = 'test'user_fail = Falsedata = {'workout': 3,diff --git a/wger/manager/tests/test_set.py b/wger/manager/tests/test_set.pyindex 40710b6a6..f80e2b2bb 100644--- a/wger/manager/tests/test_set.py+++ b/wger/manager/tests/test_set.py@@ -39,7 +39,6 @@ class SetAddTestCase(WorkoutManagerAddTestCase):object_class = Seturl = reverse_lazy('set-add', kwargs={'day_pk': 5})- pk = 4user_success = 'test'user_fail = 'admin'data = {'exercises': [1, ],diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.pyindex 2272c3132..854caeb45 100644--- a/wger/manager/tests/test_weight_log.py+++ b/wger/manager/tests/test_weight_log.py@@ -169,7 +169,6 @@ class WeightLogAddTestCase(WorkoutManagerAddTestCase):object_class = WorkoutLogurl = reverse_lazy('workout-log-add', kwargs={'workout_pk': 1})- pk = 6data = {'reps': 10,'weight': 120.5,'date': datetime.date.today(),diff --git a/wger/manager/tests/test_workout_session.py b/wger/manager/tests/test_workout_session.pyindex 4c58db445..73c6fbf14 100644--- a/wger/manager/tests/test_workout_session.py+++ b/wger/manager/tests/test_workout_session.py@@ -40,7 +40,6 @@ class AddWorkoutSessionTestCase(WorkoutManagerAddTestCase):'year': datetime.date.today().year,'month': datetime.date.today().month,'day': datetime.date.today().day})- pk = 5data = {'user': 1,'workout': 1,diff --git a/wger/manager/tests/testcase.py b/wger/manager/tests/testcase.pyindex 0951d18f7..0661da206 100644--- a/wger/manager/tests/testcase.py+++ b/wger/manager/tests/testcase.py@@ -362,7 +362,8 @@ class WorkoutManagerAddTestCase(WorkoutManagerTestCase):object_class = ''url = ''- pk = None+ pk_before = None+ pk_after = Noneanonymous_fail = Truedata = {}data_ignore = ()@@ -387,27 +388,25 @@ class WorkoutManagerAddTestCase(WorkoutManagerTestCase):# Enter the datacount_before = self.object_class.objects.count()+ self.pk_before = self.object_class.objects.all().order_by('id').last().pkresponse = self.client.post(get_reverse(self.url), self.data)-count_after = self.object_class.objects.count()+ self.pk_after = self.object_class.objects.all().order_by('id').last().pk+if fail:self.assertIn(response.status_code, STATUS_CODES_FAIL)- self.assertTemplateUsed('login.html')-- self.assertRaises(self.object_class.DoesNotExist,- self.object_class.objects.get,- pk=self.pk)+ self.assertEqual(self.pk_before, self.pk_after)self.assertEqual(count_before, count_after)else:self.assertEqual(response.status_code, 302)- entry = self.object_class.objects.get(pk=self.pk)+ self.assertGreater(self.pk_after, self.pk_before)+ entry = self.object_class.objects.get(pk=self.pk_after)# Check that the data is correct- for i in self.data:- if i not in self.data_ignore:- current_field = getattr(entry, i)- self.compare_fields(current_field, self.data[i])+ for i in [j for j in self.data if j not in self.data_ignore]:+ current_field = getattr(entry, i)+ self.compare_fields(current_field, self.data[i])self.assertEqual(count_before + 1, count_after)diff --git a/wger/nutrition/tests/test_ingredient.py b/wger/nutrition/tests/test_ingredient.pyindex 79ae9fdaa..204e35544 100644--- a/wger/nutrition/tests/test_ingredient.py+++ b/wger/nutrition/tests/test_ingredient.py@@ -77,7 +77,6 @@ class AddIngredientTestCase(WorkoutManagerAddTestCase):object_class = Ingredienturl = 'ingredient-add'- pk = 5371user_fail = Falsedata = {'name': 'A new ingredient','sodium': 2,@@ -96,11 +95,11 @@ class AddIngredientTestCase(WorkoutManagerAddTestCase):Test that the creation date and the status are correctly set'''if self.current_user == 'admin':- ingredient = Ingredient.objects.get(pk=self.pk)+ ingredient = Ingredient.objects.get(pk=self.pk_after)self.assertEqual(ingredient.creation_date, datetime.date.today())self.assertEqual(ingredient.status, Ingredient.INGREDIENT_STATUS_ADMIN)elif self.current_user == 'test':- ingredient = Ingredient.objects.get(pk=self.pk)+ ingredient = Ingredient.objects.get(pk=self.pk_after)self.assertEqual(ingredient.status, Ingredient.INGREDIENT_STATUS_PENDING)diff --git a/wger/nutrition/tests/test_meal.py b/wger/nutrition/tests/test_meal.pyindex b0590cdc6..5f5c4e3de 100644--- a/wger/nutrition/tests/test_meal.py+++ b/wger/nutrition/tests/test_meal.py@@ -44,7 +44,6 @@ class AddMealTestCase(WorkoutManagerAddTestCase):object_class = Mealurl = reverse('meal-add', kwargs={'plan_pk': 4})- pk = 12data = {'time': datetime.time(9, 2)}user_success = 'test'user_fail = 'admin'diff --git a/wger/nutrition/tests/test_meal_item.py b/wger/nutrition/tests/test_meal_item.pyindex f384a24da..087b066b2 100644--- a/wger/nutrition/tests/test_meal_item.py+++ b/wger/nutrition/tests/test_meal_item.py@@ -54,7 +54,6 @@ class AddMealItemUnitTestCase(WorkoutManagerAddTestCase):object_class = MealItemurl = reverse('mealitem-add', kwargs={'meal_id': 3})- pk = 22data = {'amount': 1,'ingredient': 1,'weight_unit': 1}@@ -67,7 +66,6 @@ class AddMealItemWeightTestCase(WorkoutManagerAddTestCase):object_class = MealItemurl = reverse('mealitem-add', kwargs={'meal_id': 3})- pk = 22data = {'amount': 100,'ingredient': 1}diff --git a/wger/nutrition/tests/test_weight_unit.py b/wger/nutrition/tests/test_weight_unit.pyindex ebfced6df..74cb1080c 100644--- a/wger/nutrition/tests/test_weight_unit.py+++ b/wger/nutrition/tests/test_weight_unit.py@@ -34,7 +34,6 @@ class AddWeightUnitTestCase(WorkoutManagerAddTestCase):object_class = WeightUniturl = 'weight-unit-add'data = {'name': 'A new weight unit'}- pk = 7class DeleteWeightUnitTestCase(WorkoutManagerDeleteTestCase):diff --git a/wger/nutrition/tests/test_weight_unit_ingredient.py b/wger/nutrition/tests/test_weight_unit_ingredient.pyindex dbd8e727c..4260d2431 100644--- a/wger/nutrition/tests/test_weight_unit_ingredient.py+++ b/wger/nutrition/tests/test_weight_unit_ingredient.py@@ -37,7 +37,6 @@ class AddWeightUnitIngredientTestCase(WorkoutManagerAddTestCase):data = {'unit': 5,'gramm': 123,'amount': 1}- pk = 9875class DeleteWeightUnitIngredientTestCase(WorkoutManagerDeleteTestCase):diff --git a/wger/weight/tests/test_entry.py b/wger/weight/tests/test_entry.pyindex 79d97581f..8bf9e6fad 100644--- a/wger/weight/tests/test_entry.py+++ b/wger/weight/tests/test_entry.py@@ -28,7 +28,6 @@ class AddWeightEntryTestCase(WorkoutManagerAddTestCase):object_class = WeightEntryurl = 'weight-add'- pk = 8user_fail = Falsedata = {'weight': 81.1,'creation_date': datetime.date(2013, 2, 1),