Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Rework some of the tests

Roland Geiderd83c17170c92
diff --git a/wger/exercises/templates/exercise/overview.html b/wger/exercises/templates/exercise/overview.html
index 5c877b33a..2a508829a 100644
--- a/wger/exercises/templates/exercise/overview.html
+++ b/wger/exercises/templates/exercise/overview.html
@@ -82,6 +82,8 @@ $(document).ready(function() {
</div>
</div>
</div>
+ {% empty %}
+ <p>{% trans "No categories." %} {% trans "Use link to create one" %}</p>
{% endfor %}
</div>
{% endcache %}
diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.html
index 9430da3cd..64dcb13c0 100644
--- a/wger/exercises/templates/exercise/view.html
+++ b/wger/exercises/templates/exercise/view.html
@@ -194,8 +194,7 @@ $(document).ready(function() {
-
-{% cache cache_timeout exercise-detail-muscles exercise.id language.id %}
+{% cache cache_timeout exercise-detail-muscles cache_vary_on %}
{% with muscles=exercise.muscles.all %}
{% with muscles_secondary=exercise.muscles_secondary.all %}
diff --git a/wger/exercises/tests/test_categories.py b/wger/exercises/tests/test_categories.py
index c02648be8..00c5d60c5 100644
--- a/wger/exercises/tests/test_categories.py
+++ b/wger/exercises/tests/test_categories.py
@@ -14,6 +14,7 @@
# Django
from django.core.cache import cache
+from django.core.cache.utils import make_template_fragment_key
from django.urls import reverse
# wger
@@ -26,7 +27,6 @@ from wger.core.tests.base_testcase import (
WorkoutManagerTestCase
)
from wger.exercises.models import ExerciseCategory
-from wger.utils.cache import get_template_cache_name
class ExerciseCategoryRepresentationTestCase(WorkoutManagerTestCase):
@@ -108,19 +108,19 @@ class ExerciseCategoryCacheTestCase(WorkoutManagerTestCase):
self.client.get(reverse('exercise:exercise:overview'))
self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
- old_exercise_overview = cache.get(get_template_cache_name('exercise-overview', 2))
+ old_exercise_overview = cache.get(make_template_fragment_key('exercise-overview', [2]))
category = ExerciseCategory.objects.get(pk=2)
category.name = 'Cool category'
category.save()
- self.assertFalse(cache.get(get_template_cache_name('exercise-overview', 2)))
+ self.assertFalse(cache.get(make_template_fragment_key('exercise-overview', [2])))
self.client.get(reverse('exercise:exercise:overview'))
self.client.get(reverse('exercise:muscle:overview'))
self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
- new_exercise_overview = cache.get(get_template_cache_name('exercise-overview', 2))
+ new_exercise_overview = cache.get(make_template_fragment_key('exercise-overview', [2]))
self.assertNotEqual(old_exercise_overview, new_exercise_overview)
diff --git a/wger/exercises/tests/test_equipment.py b/wger/exercises/tests/test_equipment.py
index 2fa6f1a45..89b647ea1 100644
--- a/wger/exercises/tests/test_equipment.py
+++ b/wger/exercises/tests/test_equipment.py
@@ -15,6 +15,7 @@
# Django
from django.core.cache import cache
+from django.core.cache.utils import make_template_fragment_key
from django.urls import reverse
# wger
@@ -29,7 +30,6 @@ from wger.exercises.models import (
Equipment,
Exercise
)
-from wger.utils.cache import get_template_cache_name
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
@@ -144,9 +144,9 @@ class EquipmentCacheTestCase(WorkoutManagerTestCase):
"""
Test the equipment overview cache is correctly generated on visit
"""
- self.assertFalse(cache.get(get_template_cache_name('equipment-overview', 2)))
+ self.assertFalse(cache.get(make_template_fragment_key('equipment-overview', [2])))
self.client.get(reverse('exercise:equipment:overview'))
- self.assertTrue(cache.get(get_template_cache_name('equipment-overview', 2)))
+ self.assertTrue(cache.get(make_template_fragment_key('equipment-overview', [2])))
def test_equipmet_cache_update(self):
"""
@@ -154,12 +154,12 @@ class EquipmentCacheTestCase(WorkoutManagerTestCase):
performing certain operations
"""
- self.assertFalse(cache.get(get_template_cache_name('equipment-overview', 2)))
+ self.assertFalse(cache.get(make_template_fragment_key('equipment-overview', [2])))
self.client.get(reverse('exercise:equipment:overview'))
self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
- old_overview = cache.get(get_template_cache_name('equipment-overview', 2))
+ old_overview = cache.get(make_template_fragment_key('equipment-overview', [2]))
exercise = Exercise.objects.get(pk=2)
exercise.name = 'Very cool exercise 2'
@@ -167,12 +167,12 @@ class EquipmentCacheTestCase(WorkoutManagerTestCase):
exercise.equipment.add(Equipment.objects.get(pk=2))
exercise.save()
- self.assertFalse(cache.get(get_template_cache_name('equipment-overview', 2)))
+ self.assertFalse(cache.get(make_template_fragment_key('equipment-overview', [2])))
self.client.get(reverse('exercise:equipment:overview'))
self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
- new_overview = cache.get(get_template_cache_name('equipment-overview', 2))
+ new_overview = cache.get(make_template_fragment_key('equipment-overview', [2]))
self.assertNotEqual(old_overview, new_overview)
diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.py
index 18bd8672f..d26ac34aa 100644
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@ -18,6 +18,7 @@ import json
# Django
from django.core import mail
from django.core.cache import cache
+from django.core.cache.utils import make_template_fragment_key
from django.urls import reverse
# wger
@@ -31,10 +32,7 @@ from wger.exercises.models import (
ExerciseCategory,
Muscle
)
-from wger.utils.cache import (
- cache_mapper,
- get_template_cache_name
-)
+from wger.utils.cache import cache_mapper
class ExerciseRepresentationTestCase(WorkoutManagerTestCase):
@@ -419,9 +417,9 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):
"""
Test the exercise overview cache is correctly generated on visit
"""
- self.assertFalse(cache.get(get_template_cache_name('exercise-overview', 2)))
+ self.assertFalse(cache.get(make_template_fragment_key('exercise-overview', [2])))
self.client.get(reverse('exercise:exercise:overview'))
- self.assertTrue(cache.get(get_template_cache_name('exercise-overview', 2)))
+ self.assertTrue(cache.get(make_template_fragment_key('exercise-overview', [2])))
def test_exercise_detail(self):
"""
@@ -434,16 +432,16 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):
performing certain operations
"""
self.assertFalse(cache.get(cache_mapper.get_exercise_muscle_bg_key(2)))
- self.assertFalse(cache.get(get_template_cache_name('muscle-overview', 2)))
- self.assertFalse(cache.get(get_template_cache_name('muscle-overview-search', 2)))
- self.assertFalse(cache.get(get_template_cache_name('exercise-overview', 2)))
+ self.assertFalse(cache.get(make_template_fragment_key('muscle-overview', [2])))
+ self.assertFalse(cache.get(make_template_fragment_key('muscle-overview-search', [2])))
+ self.assertFalse(cache.get(make_template_fragment_key('exercise-overview', [2])))
self.client.get(reverse('exercise:exercise:overview'))
self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
old_exercise_bg = cache.get(cache_mapper.get_exercise_muscle_bg_key(2))
- old_muscle_overview = cache.get(get_template_cache_name('muscle-overview', 2))
- old_exercise_overview = cache.get(get_template_cache_name('exercise-overview', 2))
+ old_muscle_overview = cache.get(make_template_fragment_key('muscle-overview', [2]))
+ old_exercise_overview = cache.get(make_template_fragment_key('exercise-overview', [2]))
exercise = Exercise.objects.get(pk=2)
exercise.name = 'Very cool exercise 2'
@@ -452,16 +450,16 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):
exercise.save()
self.assertFalse(cache.get(cache_mapper.get_exercise_muscle_bg_key(2)))
- self.assertFalse(cache.get(get_template_cache_name('muscle-overview', 2)))
- self.assertFalse(cache.get(get_template_cache_name('exercise-overview', 2)))
+ self.assertFalse(cache.get(make_template_fragment_key('muscle-overview', [2])))
+ self.assertFalse(cache.get(make_template_fragment_key('exercise-overview', [2])))
self.client.get(reverse('exercise:exercise:overview'))
self.client.get(reverse('exercise:muscle:overview'))
self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
new_exercise_bg = cache.get(cache_mapper.get_exercise_muscle_bg_key(2))
- new_muscle_overview = cache.get(get_template_cache_name('muscle-overview', 2))
- new_exercise_overview = cache.get(get_template_cache_name('exercise-overview', 2))
+ new_muscle_overview = cache.get(make_template_fragment_key('muscle-overview', [2]))
+ new_exercise_overview = cache.get(make_template_fragment_key('exercise-overview', [2]))
self.assertNotEqual(old_exercise_bg, new_exercise_bg)
self.assertNotEqual(old_exercise_overview, new_exercise_overview)
@@ -472,27 +470,27 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):
Test that the template cache for the overview is correctly reset when
performing certain operations
"""
- self.assertFalse(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))
+ self.assertFalse(cache.get(make_template_fragment_key('exercise-detail-muscles', ["2-2"])))
self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
- self.assertTrue(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))
+ self.assertTrue(cache.get(make_template_fragment_key('exercise-detail-muscles', ["2-2"])))
muscle = Muscle.objects.get(pk=2)
muscle.delete()
- self.assertFalse(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))
+ self.assertFalse(cache.get(make_template_fragment_key('exercise-detail-muscles', ["2-2"])))
def test_muscles_cache_update_on_update(self):
"""
Test that the template cache for the overview is correctly reset when
performing certain operations
"""
- self.assertFalse(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))
+ self.assertFalse(cache.get(make_template_fragment_key('exercise-detail-muscles', ["2-2"])))
self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
- self.assertTrue(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))
+ self.assertTrue(cache.get(make_template_fragment_key('exercise-detail-muscles', ["2-2"])))
muscle = Muscle.objects.get(pk=2)
muscle.name = 'foo'
muscle.save()
- self.assertFalse(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))
+ self.assertFalse(cache.get(make_template_fragment_key('exercise-detail-muscles', ["2-2"])))
class WorkoutCacheTestCase(WorkoutManagerTestCase):
diff --git a/wger/exercises/tests/test_muscles.py b/wger/exercises/tests/test_muscles.py
index 89c2fdf93..7820c440c 100644
--- a/wger/exercises/tests/test_muscles.py
+++ b/wger/exercises/tests/test_muscles.py
@@ -15,6 +15,7 @@
# Django
from django.core.cache import cache
+from django.core.cache.utils import make_template_fragment_key
from django.urls import reverse
# wger
@@ -27,7 +28,6 @@ from wger.core.tests.base_testcase import (
WorkoutManagerTestCase
)
from wger.exercises.models import Muscle
-from wger.utils.cache import get_template_cache_name
class MuscleRepresentationTestCase(WorkoutManagerTestCase):
@@ -125,9 +125,9 @@ class MuscleCacheTestCase(WorkoutManagerTestCase):
Test the muscle overview cache is correctly generated on visit
"""
- self.assertFalse(cache.get(get_template_cache_name('muscle-overview', 2)))
+ self.assertFalse(cache.get(make_template_fragment_key('muscle-overview', [2])))
self.client.get(reverse('exercise:muscle:overview'))
- self.assertTrue(cache.get(get_template_cache_name('muscle-overview', 2)))
+ self.assertTrue(cache.get(make_template_fragment_key('muscle-overview', [2])))
class MuscleOverviewTestCase(WorkoutManagerAccessTestCase):
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index db665b1f4..a35bbffef 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -177,6 +177,7 @@ def view(request, id, slug=None):
template_data['logs'] = entry_log
template_data['json'] = chart_data
template_data['svg_uuid'] = str(uuid.uuid4())
+ template_data['cache_vary_on'] = "{}-{}".format(exercise.id, load_language().id)
return render(request, 'exercise/view.html', template_data)
diff --git a/wger/manager/signals.py b/wger/manager/signals.py
index 7999b5a93..f3a6df408 100644
--- a/wger/manager/signals.py
+++ b/wger/manager/signals.py
@@ -61,7 +61,7 @@ def reset_muscle_cache(sender, instance, **kwargs):
for exercise in exercises:
for language in languages:
delete_template_fragment_cache('exercise-detail-muscles',
- exercise.id, language.id)
+ "{}-{}".format(exercise.id, language.id))
post_save.connect(reset_muscle_cache, sender=Muscle)
diff --git a/wger/manager/tests/test_timer.py b/wger/manager/tests/test_timer.py
index 497ad5816..4bb6ef0ba 100644
--- a/wger/manager/tests/test_timer.py
+++ b/wger/manager/tests/test_timer.py
@@ -17,10 +17,9 @@ import datetime
import logging
import math
from decimal import Decimal
-
-# Django
from unittest import skip
+# Django
from django.contrib.auth.models import User
from django.urls import reverse
diff --git a/wger/utils/cache.py b/wger/utils/cache.py
index 5816138b2..428097e8a 100644
--- a/wger/utils/cache.py
+++ b/wger/utils/cache.py
@@ -13,32 +13,22 @@
# You should have received a copy of the GNU Affero General Public License
# Standard Library
-import hashlib
import logging
# Django
from django.core.cache import cache
-from django.utils.encoding import force_bytes
+from django.core.cache.utils import make_template_fragment_key
logger = logging.getLogger(__name__)
-def get_template_cache_name(fragment_name='', *args):
- """
- Logic to calculate the cache key name when using django's template cache.
- Code taken from django/templatetags/cache.py
- """
- key = u':'.join([str(arg) for arg in args])
- key_name = hashlib.md5(force_bytes(key)).hexdigest()
- return 'template.cache.{0}.{1}'.format(fragment_name, key_name)
-
-
-def delete_template_fragment_cache(fragment_name='', *args):
+def delete_template_fragment_cache(fragment_name='', vary_on=None):
"""
Deletes a cache key created on the template with django's cache tag
"""
- cache.delete(get_template_cache_name(fragment_name, *args))
+ out = vary_on if isinstance(vary_on, (list, tuple)) else [vary_on]
+ cache.delete(make_template_fragment_key(fragment_name, out))
def reset_workout_canonical_form(workout_id):