Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Don't hard code PKs of objects

Roland Geider6141befcf8af
diff --git a/wger/core/tests/test_temporary_users.py b/wger/core/tests/test_temporary_users.py
index 7910588b3..31e8a4a73 100644
--- a/wger/core/tests/test_temporary_users.py
+++ b/wger/core/tests/test_temporary_users.py
@@ -51,7 +51,7 @@ class DemoUserTestCase(WorkoutManagerTestCase):
'''
self.client.get(reverse('core:dashboard'))
self.assertEqual(self.count_temp_users(), 2)
- user = User.objects.get(pk=25)
+ user = User.objects.get(pk=User.objects.latest('id').id)
self.assertEqual(user.userprofile.is_temporary, True)
self.assertEqual(Workout.objects.filter(user=user).count(), 0)
diff --git a/wger/exercises/tests/test_exercise_images.py b/wger/exercises/tests/test_exercise_images.py
index de8ad75a7..7f8c659b3 100644
--- a/wger/exercises/tests/test_exercise_images.py
+++ b/wger/exercises/tests/test_exercise_images.py
@@ -52,6 +52,7 @@ class MainImageTestCase(WorkoutManagerTestCase):
File(open('wger/exercises/tests/{0}'.format(filename), encoding='latin1'), 'rb')
)
image.save()
+ return(image.pk)
def test_auto_main_image(self):
'''
@@ -59,9 +60,9 @@ class MainImageTestCase(WorkoutManagerTestCase):
'''
exercise = Exercise.objects.get(pk=2)
- self.save_image(exercise, 'protestschwein.jpg')
+ pk = self.save_image(exercise, 'protestschwein.jpg')
- image = ExerciseImage.objects.get(pk=4)
+ image = ExerciseImage.objects.get(pk=pk)
self.assertTrue(image.is_main)
def test_auto_main_image_multiple(self):
@@ -70,13 +71,13 @@ class MainImageTestCase(WorkoutManagerTestCase):
'''
exercise = Exercise.objects.get(pk=2)
- self.save_image(exercise, 'protestschwein.jpg')
- self.save_image(exercise, 'wildschwein.jpg')
+ pk1 = self.save_image(exercise, 'protestschwein.jpg')
+ pk2 = self.save_image(exercise, 'wildschwein.jpg')
- image = ExerciseImage.objects.get(pk=4)
+ image = ExerciseImage.objects.get(pk=pk1)
self.assertTrue(image.is_main)
- image = ExerciseImage.objects.get(pk=5)
+ image = ExerciseImage.objects.get(pk=pk2)
self.assertFalse(image.is_main)
def test_delete_main_image(self):
@@ -85,28 +86,28 @@ class MainImageTestCase(WorkoutManagerTestCase):
'''
exercise = Exercise.objects.get(pk=2)
- self.save_image(exercise, 'protestschwein.jpg')
- self.save_image(exercise, 'protestschwein.jpg')
- self.save_image(exercise, 'wildschwein.jpg')
- self.save_image(exercise, 'wildschwein.jpg')
- self.save_image(exercise, 'wildschwein.jpg')
+ pk1 = self.save_image(exercise, 'protestschwein.jpg')
+ pk2 = self.save_image(exercise, 'protestschwein.jpg')
+ pk3 = self.save_image(exercise, 'wildschwein.jpg')
+ pk4 = self.save_image(exercise, 'wildschwein.jpg')
+ pk5 = self.save_image(exercise, 'wildschwein.jpg')
- image = ExerciseImage.objects.get(pk=4)
+ image = ExerciseImage.objects.get(pk=pk1)
self.assertTrue(image.is_main)
image.delete()
- self.assertTrue(ExerciseImage.objects.get(pk=5).is_main)
- self.assertFalse(ExerciseImage.objects.get(pk=6).is_main)
- self.assertFalse(ExerciseImage.objects.get(pk=7).is_main)
- self.assertFalse(ExerciseImage.objects.get(pk=8).is_main)
+ self.assertTrue(ExerciseImage.objects.get(pk=pk2).is_main)
+ self.assertFalse(ExerciseImage.objects.get(pk=pk3).is_main)
+ self.assertFalse(ExerciseImage.objects.get(pk=pk4).is_main)
+ self.assertFalse(ExerciseImage.objects.get(pk=pk5).is_main)
- image = ExerciseImage.objects.get(pk=5)
+ image = ExerciseImage.objects.get(pk=pk2)
self.assertTrue(image.is_main)
image.delete()
- self.assertTrue(ExerciseImage.objects.get(pk=6).is_main)
- self.assertFalse(ExerciseImage.objects.get(pk=7).is_main)
- self.assertFalse(ExerciseImage.objects.get(pk=8).is_main)
+ self.assertTrue(ExerciseImage.objects.get(pk=pk3).is_main)
+ self.assertFalse(ExerciseImage.objects.get(pk=pk4).is_main)
+ self.assertFalse(ExerciseImage.objects.get(pk=pk5).is_main)
class AddExerciseImageTestCase(WorkoutManagerAddTestCase):
diff --git a/wger/manager/tests/test_set.py b/wger/manager/tests/test_set.py
index d93f07790..6ef82448b 100644
--- a/wger/manager/tests/test_set.py
+++ b/wger/manager/tests/test_set.py
@@ -77,7 +77,7 @@ class SetAddTestCase(WorkoutManagerAddTestCase):
response = self.client.post(reverse('manager:set:add', kwargs={'day_pk': 5}), post_data)
self.assertEqual(response.status_code, 302)
- set_obj = Set.objects.get(pk=4)
+ set_obj = Set.objects.get(pk=Set.objects.latest('id').id)
exercise1 = Exercise.objects.get(pk=1)
# Check that everything got where it's supposed to