Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix tests: replace date= with datetime_start

Apple2f7784f2f776
diff --git a/wger/manager/tests/test_log_model.py b/wger/manager/tests/test_log_model.py
index b934a6fc4..920858861 100644
--- a/wger/manager/tests/test_log_model.py
+++ b/wger/manager/tests/test_log_model.py
@@ -66,7 +66,7 @@ class LogModelTestCase(WgerTestCase):
# A duplicate (user, date, routine=None) — only possible because a NULL
# routine escapes the unique_together guard.
- WorkoutSession.objects.create(user_id=1, date=session.date, routine=None)
+ WorkoutSession.objects.create(user_id=1, datetime_start=session.datetime_start, routine=None)
self.assertEqual(WorkoutSession.objects.count(), 2)
# A second log for the same day must not crash and must not add a session.
@@ -90,7 +90,7 @@ class LogModelTestCase(WgerTestCase):
log = WorkoutLog.objects.get(pk='aaaaaaaa-aaaa-aaaa-aaaa-000000000001')
target = WorkoutSession.objects.get(pk='bbbbbbbb-bbbb-bbbb-bbbb-000000000002')
self.assertEqual(log.user_id, target.user_id)
- self.assertNotEqual(log.date.date(), target.date)
+ self.assertNotEqual(log.date.date(), target.datetime_start.date())
log.session = target
log.save()
diff --git a/wger/manager/tests/test_log_session_api.py b/wger/manager/tests/test_log_session_api.py
index 546ca3a2e..b42ff1c5d 100644
--- a/wger/manager/tests/test_log_session_api.py
+++ b/wger/manager/tests/test_log_session_api.py
@@ -17,6 +17,7 @@ import datetime
# Django
from django.urls import reverse
+from django.utils import timezone
# Third Party
from rest_framework import status
@@ -104,7 +105,7 @@ class WorkoutLogSessionPinningRESTTestCase(WgerTestCase):
"""POST without a session falls back to the legacy auto-create."""
new_date = datetime.date(2030, 6, 15)
- before = WorkoutSession.objects.filter(user_id=1, routine_id=1, date=new_date).count()
+ before = WorkoutSession.objects.filter(user_id=1, routine_id=1, datetime_start__date=new_date).count()
self.assertEqual(before, 0)
response = self.client.post(
@@ -122,7 +123,7 @@ class WorkoutLogSessionPinningRESTTestCase(WgerTestCase):
log = WorkoutLog.objects.get(pk=response.json()['id'])
self.assertIsNotNone(log.session_id)
self.assertEqual(log.session.user_id, 1)
- self.assertEqual(log.session.date, new_date)
+ self.assertEqual(timezone.localtime(log.session.datetime_start).date(), new_date)
def test_patch_log_with_foreign_session_rejected(self):
"""PATCH that tries to move a log onto a foreign session returns 403."""
diff --git a/wger/trophies/tests/test_integration.py b/wger/trophies/tests/test_integration.py
index b6f5ac30f..f935ed2cf 100644
--- a/wger/trophies/tests/test_integration.py
+++ b/wger/trophies/tests/test_integration.py
@@ -479,7 +479,7 @@ class UserDeletionTestCase(WgerTestCase):
user = User.objects.create_user('to_delete', '[email protected]', 'pass')
exercise = Exercise.objects.create(category=ExerciseCategory.objects.create(name='cat'))
- WorkoutSession.objects.create(user=user, date=datetime.date(2024, 1, 1))
+ WorkoutSession.objects.create(user=user, datetime_start=datetime.datetime(2024, 1, 1, tzinfo=datetime.timezone.utc))
WorkoutLog.objects.create(user=user, exercise=exercise, repetitions=10, weight=100)
# The statistics row is already gone when the workout-deletion signals
@@ -533,7 +533,7 @@ class LoadDataSignalGuardTestCase(WgerTestCase):
def test_raw_workout_session_save_skips_statistics(self):
"""A raw WorkoutSession save creates no statistics row"""
- session = WorkoutSession.objects.create(user=self.user, date=datetime.date(2024, 1, 1))
+ session = WorkoutSession.objects.create(user=self.user, datetime_start=datetime.datetime(2024, 1, 1, tzinfo=datetime.timezone.utc))
UserStatistics.objects.filter(user=self.user).delete()