Self hosted FLOSS fitness/workout, nutrition and weight tracker
Fix tests
Roland Geider72a19a13c3f0
diff --git a/settings/settings_global.py b/settings/settings_global.pyindex 6a33ea4ee..e00dadc6b 100644--- a/settings/settings_global.py+++ b/settings/settings_global.py@@ -56,6 +56,7 @@ INSTALLED_APPS = ['django.contrib.sessions','django.contrib.sites','django.contrib.staticfiles',+ 'django.contrib.postgres','storages',# Uncomment the next line to enable the admin:diff --git a/wger/gym/tests/test_user_last_activity.py b/wger/gym/tests/test_user_last_activity.pyindex 0769808e3..721a6a475 100644--- a/wger/gym/tests/test_user_last_activity.py+++ b/wger/gym/tests/test_user_last_activity.py@@ -40,8 +40,8 @@ class UserLastActivityTestCase(WgerTestCase):"""self.user_login('admin')user = User.objects.get(username='admin')- log = WorkoutLog.objects.get(pk=1)- session = WorkoutSession.objects.get(pk=1)+ log = WorkoutLog.objects.get(pk='aaaaaaaa-aaaa-aaaa-aaaa-000000000001')+ session = WorkoutSession.objects.get(pk='bbbbbbbb-bbbb-bbbb-bbbb-000000000001')self.assertEqual(user.usercache.last_activity, datetime.date(2025, 11, 1))self.assertEqual(diff --git a/wger/manager/fixtures/test-workout-log-data.json b/wger/manager/fixtures/test-workout-log-data.jsonindex 82401d776..d69e99a52 100644--- a/wger/manager/fixtures/test-workout-log-data.json+++ b/wger/manager/fixtures/test-workout-log-data.json@@ -1,67 +1,67 @@[- {- "pk": 1,- "model": "manager.workoutlog",- "fields": {- "routine": 1,- "session": 1,- "weight": 30,- "repetitions": 8,- "user": 1,- "date": "2025-10-01T00:00:00+01:00",- "exercise": 1+ {+ "pk": "aaaaaaaa-aaaa-aaaa-aaaa-000000000001",+ "model": "manager.workoutlog",+ "fields": {+ "routine": 1,+ "session": "bbbbbbbb-bbbb-bbbb-bbbb-000000000001",+ "weight": 30,+ "repetitions": 8,+ "user": 1,+ "date": "2025-10-01T00:00:00+01:00",+ "exercise": 1+ }+ },+ {+ "pk": "aaaaaaaa-aaaa-aaaa-aaaa-000000000002",+ "model": "manager.workoutlog",+ "fields": {+ "routine": 1,+ "session": "bbbbbbbb-bbbb-bbbb-bbbb-000000000002",+ "weight": 32,+ "repetitions": 8,+ "user": 1,+ "date": "2025-10-20T00:00:00+01:00",+ "exercise": 1+ }+ },+ {+ "pk": "aaaaaaaa-aaaa-aaaa-aaaa-000000000003",+ "model": "manager.workoutlog",+ "fields": {+ "routine": 1,+ "session": "bbbbbbbb-bbbb-bbbb-bbbb-000000000003",+ "weight": 38,+ "repetitions": 8,+ "user": 1,+ "date": "2025-10-30T00:00:00+01:00",+ "exercise": 1+ }+ },+ {+ "pk": "aaaaaaaa-aaaa-aaaa-aaaa-000000000004",+ "model": "manager.workoutlog",+ "fields": {+ "routine": 1,+ "session": "bbbbbbbb-bbbb-bbbb-bbbb-000000000004",+ "weight": 30,+ "repetitions": 8,+ "user": 1,+ "date": "2025-11-01T00:00:00+01:00",+ "exercise": 1+ }+ },+ {+ "pk": "aaaaaaaa-aaaa-aaaa-aaaa-000000000005",+ "model": "manager.workoutlog",+ "fields": {+ "weight": 30,+ "session": "bbbbbbbb-bbbb-bbbb-bbbb-000000000005",+ "routine": 5,+ "repetitions": 8,+ "user": 2,+ "date": "2025-11-01T00:00:00+01:00",+ "exercise": 2+ }}- },- {- "pk": 2,- "model": "manager.workoutlog",- "fields": {- "routine": 1,- "session": 2,- "weight": 32,- "repetitions": 8,- "user": 1,- "date": "2025-10-20T00:00:00+01:00",- "exercise": 1- }- },- {- "pk": 3,- "model": "manager.workoutlog",- "fields": {- "routine": 1,- "session": 3,- "weight": 38,- "repetitions": 8,- "user": 1,- "date": "2025-10-30T00:00:00+01:00",- "exercise": 1- }- },- {- "pk": 4,- "model": "manager.workoutlog",- "fields": {- "routine": 1,- "session": 4,- "weight": 30,- "repetitions": 8,- "user": 1,- "date": "2025-11-01T00:00:00+01:00",- "exercise": 1- }- },- {- "pk": 5,- "model": "manager.workoutlog",- "fields": {- "weight": 30,- "session": 5,- "routine": 5,- "repetitions": 8,- "user": 2,- "date": "2025-11-01T00:00:00+01:00",- "exercise": 2- }- }]diff --git a/wger/manager/fixtures/test-workout-session.json b/wger/manager/fixtures/test-workout-session.jsonindex 108bb4b02..cc1bca211 100644--- a/wger/manager/fixtures/test-workout-session.json+++ b/wger/manager/fixtures/test-workout-session.json@@ -1,67 +1,67 @@[- {- "pk": 1,- "model": "manager.workoutsession",- "fields": {- "impression": "2",- "time_start": "17:00:00",- "routine": 1,- "time_end": "18:30:00",- "user": 1,- "date": "2025-10-01",- "notes": "Notes come here"+ {+ "pk": "bbbbbbbb-bbbb-bbbb-bbbb-000000000001",+ "model": "manager.workoutsession",+ "fields": {+ "impression": "2",+ "time_start": "17:00:00",+ "routine": 1,+ "time_end": "18:30:00",+ "user": 1,+ "date": "2025-10-01",+ "notes": "Notes come here"+ }+ },+ {+ "pk": "bbbbbbbb-bbbb-bbbb-bbbb-000000000002",+ "model": "manager.workoutsession",+ "fields": {+ "impression": "3",+ "time_start": "17:00:00",+ "routine": 1,+ "time_end": "18:00:00",+ "user": 1,+ "date": "2025-01-20",+ "notes": "Even more notes and impressions"+ }+ },+ {+ "pk": "bbbbbbbb-bbbb-bbbb-bbbb-000000000003",+ "model": "manager.workoutsession",+ "fields": {+ "impression": "3",+ "time_start": "10:00:00",+ "routine": 2,+ "time_end": "15:00:00",+ "user": 1,+ "date": "2025-01-30",+ "notes": "I spent the whole day in the gym"+ }+ },+ {+ "pk": "bbbbbbbb-bbbb-bbbb-bbbb-000000000004",+ "model": "manager.workoutsession",+ "fields": {+ "impression": "3",+ "time_start": "10:00:00",+ "routine": 3,+ "time_end": "10:15:00",+ "user": 1,+ "date": "2025-11-01",+ "notes": "Something, something else"+ }+ },+ {+ "pk": "bbbbbbbb-bbbb-bbbb-bbbb-000000000005",+ "model": "manager.workoutsession",+ "fields": {+ "impression": "3",+ "time_start": "10:00:00",+ "routine": 3,+ "time_end": "10:15:00",+ "user": 2,+ "date": "2025-11-01",+ "notes": "Something, something else"+ }}- },- {- "pk": 2,- "model": "manager.workoutsession",- "fields": {- "impression": "3",- "time_start": "17:00:00",- "routine": 1,- "time_end": "18:00:00",- "user": 1,- "date": "2025-01-20",- "notes": "Even more notes and impressions"- }- },- {- "pk": 3,- "model": "manager.workoutsession",- "fields": {- "impression": "3",- "time_start": "10:00:00",- "routine": 2,- "time_end": "15:00:00",- "user": 1,- "date": "2025-01-30",- "notes": "I spent the whole day in the gym"- }- },- {- "pk": 4,- "model": "manager.workoutsession",- "fields": {- "impression": "3",- "time_start": "10:00:00",- "routine": 3,- "time_end": "10:15:00",- "user": 1,- "date": "2025-11-01",- "notes": "Something, something else"- }- },- {- "pk": 5,- "model": "manager.workoutsession",- "fields": {- "impression": "3",- "time_start": "10:00:00",- "routine": 3,- "time_end": "10:15:00",- "user": 2,- "date": "2025-11-01",- "notes": "Something, something else"- }- }]diff --git a/wger/manager/tests/test_log_model.py b/wger/manager/tests/test_log_model.pyindex 4f6be5f4e..3c07644f7 100644--- a/wger/manager/tests/test_log_model.py+++ b/wger/manager/tests/test_log_model.py@@ -57,8 +57,8 @@ class LogModelTestCase(WgerTestCase):self.assertEqual(WorkoutSession.objects.count(), 5)- log = WorkoutLog.objects.get(pk=1)- log.session_id = 1+ log = WorkoutLog.objects.get(pk='aaaaaaaa-aaaa-aaaa-aaaa-000000000001')+ log.session_id = 'bbbbbbbb-bbbb-bbbb-bbbb-000000000001'self.assertEqual(WorkoutSession.objects.count(), 5)@@ -66,13 +66,13 @@ class LogModelTestCase(WgerTestCase):"""Test that the session foreign key checks ownership"""- session1 = WorkoutSession.objects.get(pk=1)- session5 = WorkoutSession.objects.get(pk=5)+ session1 = WorkoutSession.objects.get(pk='bbbbbbbb-bbbb-bbbb-bbbb-000000000001')+ session5 = WorkoutSession.objects.get(pk='bbbbbbbb-bbbb-bbbb-bbbb-000000000005')self.assertEqual(session1.user_id, 1)self.assertEqual(session5.user_id, 2)- log = WorkoutLog.objects.get(pk=1)+ log = WorkoutLog.objects.get(pk='aaaaaaaa-aaaa-aaaa-aaaa-000000000001')log.session = session5log.save()@@ -83,12 +83,12 @@ class LogModelTestCase(WgerTestCase):Test that the routine foreign key checks ownership"""- log = WorkoutLog.objects.get(pk=1)+ log = WorkoutLog.objects.get(pk='aaaaaaaa-aaaa-aaaa-aaaa-000000000001')log.routine_id = 3log.save()# Reload from db- log = WorkoutLog.objects.get(pk=1)+ log = WorkoutLog.objects.get(pk='aaaaaaaa-aaaa-aaaa-aaaa-000000000001')self.assertEqual(log.routine_id, 1)@@ -97,11 +97,11 @@ class LogModelTestCase(WgerTestCase):Test that the next log foreign key checks ownership"""- log2 = WorkoutLog.objects.get(pk=2)+ log2 = WorkoutLog.objects.get(pk='aaaaaaaa-aaaa-aaaa-aaaa-000000000002')log2.user_id = 2log2.save()- log1 = WorkoutLog.objects.get(pk=1)+ log1 = WorkoutLog.objects.get(pk='aaaaaaaa-aaaa-aaaa-aaaa-000000000001')log1.user_id = 1log1.next_log = log2log1.save()@@ -113,8 +113,8 @@ class LogModelTestCase(WgerTestCase):Test that the next log foreign key checks ownership"""- log1 = WorkoutLog.objects.get(pk=1)- log2 = WorkoutLog.objects.get(pk=2)+ log1 = WorkoutLog.objects.get(pk='aaaaaaaa-aaaa-aaaa-aaaa-000000000001')+ log2 = WorkoutLog.objects.get(pk='aaaaaaaa-aaaa-aaaa-aaaa-000000000002')self.assertEqual(log1.user_id, 1)self.assertEqual(log2.user_id, 1)diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.pyindex 2e6cacc73..e999c3856 100644--- a/wger/manager/tests/test_weight_log.py+++ b/wger/manager/tests/test_weight_log.py@@ -29,7 +29,9 @@ class WorkoutLogApiTestCase(api_base_test.ApiBaseResourceTestCase):Tests the workout log overview resource"""- pk = 5+ # WorkoutLog has a UUIDField PK. Test fixtures use a recognisable+ # `aaaaaaaa-...-NNN` pattern so test UUIDs stand out from real data.+ pk = 'aaaaaaaa-aaaa-aaaa-aaaa-000000000005'resource = WorkoutLogprivate_resource = Truedata = {diff --git a/wger/manager/tests/test_workout_session.py b/wger/manager/tests/test_workout_session.pyindex c8b06f793..d1e9b3d93 100644--- a/wger/manager/tests/test_workout_session.py+++ b/wger/manager/tests/test_workout_session.py@@ -25,7 +25,7 @@ class WorkoutSessionApiTestCase(api_base_test.ApiBaseResourceTestCase):Tests the workout overview resource"""- pk = 5+ pk = 'bbbbbbbb-bbbb-bbbb-bbbb-000000000005'resource = WorkoutSessionprivate_resource = Truedata = {diff --git a/wger/measurements/fixtures/test-measurement-categories.json b/wger/measurements/fixtures/test-measurement-categories.jsonindex 419e19e3b..e66b2c88b 100644--- a/wger/measurements/fixtures/test-measurement-categories.json+++ b/wger/measurements/fixtures/test-measurement-categories.json@@ -1,6 +1,6 @@[{- "pk": 1,+ "pk": "cccccccc-cccc-cccc-cccc-000000000001","model": "measurements.category","fields": {"user": 2,@@ -9,7 +9,7 @@}},{- "pk": 2,+ "pk": "cccccccc-cccc-cccc-cccc-000000000002","model": "measurements.category","fields": {"user": 2,@@ -18,7 +18,7 @@}},{- "pk": 3,+ "pk": "cccccccc-cccc-cccc-cccc-000000000003","model": "measurements.category","fields": {"user": 2,diff --git a/wger/measurements/fixtures/test-measurements.json b/wger/measurements/fixtures/test-measurements.jsonindex 8c1799321..8a7e6d6d8 100644--- a/wger/measurements/fixtures/test-measurements.json+++ b/wger/measurements/fixtures/test-measurements.json@@ -1,27 +1,27 @@[{- "pk": 1,+ "pk": "dddddddd-dddd-dddd-dddd-000000000001","model": "measurements.measurement","fields": {- "category": 1,+ "category": "cccccccc-cccc-cccc-cccc-000000000001","date": "2021-07-01T11:12:21.592Z","value": 20}},{- "pk": 2,+ "pk": "dddddddd-dddd-dddd-dddd-000000000002","model": "measurements.measurement","fields": {- "category": 2,+ "category": "cccccccc-cccc-cccc-cccc-000000000002","date": "2021-07-01T14:30:21.592Z","value": 100.5}},{- "pk": 3,+ "pk": "dddddddd-dddd-dddd-dddd-000000000003","model": "measurements.measurement","fields": {- "category": 1,+ "category": "cccccccc-cccc-cccc-cccc-000000000001","date": "2021-07-10T23:23:22.592Z","value": 21,"notes": "some extra information"diff --git a/wger/measurements/tests/test_categories.py b/wger/measurements/tests/test_categories.pyindex b979a8e9e..3f886e0b2 100644--- a/wger/measurements/tests/test_categories.py+++ b/wger/measurements/tests/test_categories.py@@ -12,8 +12,6 @@## You should have received a copy of the GNU Affero General Public License# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.-# Standard Library-# wgerfrom wger.core.tests import api_base_testfrom wger.measurements.models import Category@@ -24,7 +22,7 @@ class UnitApiTestCase(api_base_test.ApiBaseResourceTestCase):Tests the measurement units endpoint"""- pk = 1+ pk = 'cccccccc-cccc-cccc-cccc-000000000001'resource = Categoryprivate_resource = Truedata = {diff --git a/wger/measurements/tests/test_measurements.py b/wger/measurements/tests/test_measurements.pyindex 64234109c..c51dcf45e 100644--- a/wger/measurements/tests/test_measurements.py+++ b/wger/measurements/tests/test_measurements.py@@ -12,8 +12,6 @@## You should have received a copy of the GNU Affero General Public License# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.-# Standard Library-# wgerfrom wger.core.tests import api_base_testfrom wger.measurements.models import Measurement@@ -24,11 +22,11 @@ class MeasurementsApiTestCase(api_base_test.ApiBaseResourceTestCase):Tests the measurements endpoint"""- pk = 1+ pk = 'dddddddd-dddd-dddd-dddd-000000000001'resource = Measurementprivate_resource = Truedata = {- 'category': 2,+ 'category': 'cccccccc-cccc-cccc-cccc-000000000002','date': '2021-08-12','value': 99.99,}diff --git a/wger/nutrition/tests/test_ingredient.py b/wger/nutrition/tests/test_ingredient.pyindex 957591183..b02e3e206 100644--- a/wger/nutrition/tests/test_ingredient.py+++ b/wger/nutrition/tests/test_ingredient.py@@ -264,19 +264,23 @@ class IngredientSearchTestCase(WgerTestCase):Helper function - Searches in English"""+ # The query has to be long enough to clear the trigram similarity+ # threshold (default 0.3) — short terms like "test" get diluted by+ # the trigrams of longer ingredient names and find nothing.response = self.client.get(reverse('api-ingredientinfo-list'),- {'name__search': 'test', 'language__code': 'en'},+ {'name__search': 'Ingredient', 'language__code': 'en'},)self.assertEqual(response.status_code, 200)result = json.loads(response.content.decode('utf8'))- self.assertEqual(result['count'], 2)+ self.assertEqual(result['count'], 4)+ # Trigram ranks shorter names higher (the query is a larger fraction+ # of their trigrams). "Pending ingredient" beats "Test ingredient 1".ingredient_1 = result['results'][0]- self.assertEqual(ingredient_1['id'], 2)- self.assertEqual(ingredient_1['name'], 'Ingredient, test, 2, organic, raw')- self.assertEqual(ingredient_1['uuid'], '44dc5966-73a2-4df7-8b15-f6d37a8990d9')+ self.assertEqual(ingredient_1['id'], 7)+ self.assertEqual(ingredient_1['name'], 'Pending ingredient')self.assertEqual(ingredient_1['language']['id'], 2)self.assertEqual(ingredient_1['image'], None)self.assertEqual(ingredient_1['thumbnails'], None)@@ -294,9 +298,10 @@ class IngredientSearchTestCase(WgerTestCase):Helper function - Searches in German"""+ # See search_ingredient_en for why "test" doesn't work as a query.response = self.client.get(reverse('api-ingredientinfo-list'),- {'name__search': 'test', 'language__code': 'de'},+ {'name__search': 'Testzutat', 'language__code': 'de'},)self.assertEqual(response.status_code, 200)result = json.loads(response.content.decode('utf8'))diff --git a/wger/nutrition/tests/test_search_api.py b/wger/nutrition/tests/test_search_api.pyindex aa1beb5fa..d82f62a17 100644--- a/wger/nutrition/tests/test_search_api.py+++ b/wger/nutrition/tests/test_search_api.py@@ -28,26 +28,32 @@ class SearchIngredientApiTestCase(BaseTestCase, ApiBaseTestCase):"""Logged-out users are also allowed to use the search"""- response = self.client.get(self.url + '?name__search=test&language__code=en')+ # The query has to be long enough to clear the trigram similarity+ # threshold (default 0.3) — short terms like "test" get diluted by+ # the trigrams of longer ingredient names and find nothing.+ response = self.client.get(self.url + '?name__search=Ingredient&language__code=en')result1 = response.data['results'][0]self.assertEqual(response.status_code, status.HTTP_200_OK)- self.assertEqual(response.data['count'], 2)- self.assertEqual(result1['name'], 'Ingredient, test, 2, organic, raw')- self.assertEqual(result1['id'], 2)+ self.assertEqual(response.data['count'], 4)+ # Trigram ranks shorter names higher (the query is a larger fraction+ # of their trigrams). "Pending ingredient" beats "Test ingredient 1"+ # which beats the longer "Ingredient, test, 2, organic, raw".+ self.assertEqual(result1['name'], 'Pending ingredient')+ self.assertEqual(result1['id'], 7)def test_basic_search_logged_in(self):"""Logged-in users get the same results"""self.authenticate('test')- response = self.client.get(self.url + '?name__search=test&language__code=en')+ response = self.client.get(self.url + '?name__search=Ingredient&language__code=en')result1 = response.data['results'][0]self.assertEqual(response.status_code, status.HTTP_200_OK)- self.assertEqual(response.data['count'], 2)- self.assertEqual(result1['name'], 'Ingredient, test, 2, organic, raw')- self.assertEqual(result1['id'], 2)+ self.assertEqual(response.data['count'], 4)+ self.assertEqual(result1['name'], 'Pending ingredient')+ self.assertEqual(result1['id'], 7)def test_search_language_code_en_no_results(self):"""@@ -74,7 +80,7 @@ class SearchIngredientApiTestCase(BaseTestCase, ApiBaseTestCase):"""Passing different language codes works correctly"""- response = self.client.get(self.url + '?name__search=guest&language__code=en,de')+ response = self.client.get(self.url + '?name__search=Needed&language__code=en,de')self.assertEqual(response.status_code, status.HTTP_200_OK)self.assertEqual(response.data['count'], 5)@@ -83,7 +89,7 @@ class SearchIngredientApiTestCase(BaseTestCase, ApiBaseTestCase):"""Unknown language codes are ignored"""- response = self.client.get(self.url + '?name__search=guest&language__code=en,de,kg')+ response = self.client.get(self.url + '?name__search=Needed&language__code=en,de,kg')self.assertEqual(response.status_code, status.HTTP_200_OK)self.assertEqual(response.data['count'], 5)@@ -92,7 +98,7 @@ class SearchIngredientApiTestCase(BaseTestCase, ApiBaseTestCase):"""Disable all language filters"""- response = self.client.get(self.url + '?name__search=guest')+ response = self.client.get(self.url + '?name__search=Needed')self.assertEqual(response.status_code, status.HTTP_200_OK)self.assertEqual(response.data['count'], 7)