Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add further tests for workout template feature

Roland Geidere77d351fe0f9
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index 0bd02e720..913519d01 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -46,13 +46,13 @@
<li class="dropdown-divider"></li>
<li class="dropdown-header">{% translate "Workout templates" %}</li>
- <li><a class="dropdown-item" href="{% url 'manager:templates:overview' %}" rel="nofollow">
+ <li><a class="dropdown-item" href="{% url 'manager:template:overview' %}" rel="nofollow">
{% if not user.is_authenticated %}
<span class="{% fa_class 'lock' %}"></span>
{% endif %}
{% translate "Your templates" %}
</a></li>
- <li><a class="dropdown-item" href="{% url 'manager:templates:public' %}" rel="nofollow">
+ <li><a class="dropdown-item" href="{% url 'manager:template:public' %}" rel="nofollow">
{% if not user.is_authenticated %}
<span class="{% fa_class 'lock' %}"></span>
{% endif %}
diff --git a/wger/manager/models/workout.py b/wger/manager/models/workout.py
index 8fa1db8eb..1051935dc 100644
--- a/wger/manager/models/workout.py
+++ b/wger/manager/models/workout.py
@@ -95,7 +95,7 @@ class Workout(models.Model):
Returns the canonical URL to view a workout
"""
return reverse(
- 'manager:templates:view' if self.is_template else 'manager:workout:view',
+ 'manager:template:view' if self.is_template else 'manager:workout:view',
kwargs={'pk': self.id}
)
diff --git a/wger/manager/templates/workout/template_view.html b/wger/manager/templates/workout/template_view.html
index 23a892bb2..caa9da780 100644
--- a/wger/manager/templates/workout/template_view.html
+++ b/wger/manager/templates/workout/template_view.html
@@ -49,7 +49,7 @@
{% if is_owner %}
<div class="col text-center">
- <a href="{% url 'manager:templates:make-workout' workout.id %}" class="btn btn-outline-primary">
+ <a href="{% url 'manager:template:make-workout' workout.id %}" class="btn btn-outline-primary">
{% translate "Mark as workout" %}
</a>
</div>
diff --git a/wger/manager/tests/test_workout_template.py b/wger/manager/tests/test_workout_template.py
new file mode 100644
index 000000000..514e558aa
--- /dev/null
+++ b/wger/manager/tests/test_workout_template.py
@@ -0,0 +1,215 @@
+# This file is part of wger Workout Manager.
+#
+# wger Workout Manager is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# wger Workout Manager is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+
+# Django
+from django.urls import reverse
+
+# wger
+from wger.core.tests.base_testcase import WgerTestCase
+from wger.manager.models import Workout
+
+
+class WorkoutTemplateManagerTestCase(WgerTestCase):
+ """
+ Test accessing the workout template DB manager
+ """
+
+ def test_managers(self):
+ """
+ Test that the DB managers correctly filter the workouts
+ """
+ self.assertEqual(Workout.objects.all().count(), 3)
+ self.assertEqual(Workout.templates.all().count(), 0)
+ self.assertEqual(Workout.both.all().count(), 3)
+
+ workout = Workout.objects.get(pk=3)
+ workout.is_template = True
+ workout.save()
+ self.assertEqual(Workout.objects.all().count(), 2)
+ self.assertEqual(Workout.templates.all().count(), 1)
+ self.assertEqual(Workout.both.all().count(), 3)
+
+ workout.is_public = True
+ workout.save()
+ self.assertEqual(Workout.objects.all().count(), 2)
+ self.assertEqual(Workout.templates.all().count(), 1)
+ self.assertEqual(Workout.both.all().count(), 3)
+
+
+class WorkoutTemplateOverviewTestCase(WgerTestCase):
+ """
+ Test accessing the workout template overview page
+ """
+
+ def test_access_overviews(self):
+ """
+ Test accessing the different workout and template overviews
+ """
+ self.user_login('test')
+ response = self.client.get(reverse('manager:workout:overview'))
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(len(response.context['workouts']), 1)
+
+ response = self.client.get(reverse('manager:template:overview'))
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(len(response.context['workouts']), 0)
+
+ response = self.client.get(reverse('manager:template:public'))
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(len(response.context['workouts']), 0)
+
+ def test_access_overviews_no_public_templates(self):
+ """
+ Test accessing the different workout and template overviews - no public workouts
+ """
+
+ # Workout #1 belongs to another user
+ workout = Workout.objects.get(pk=1)
+ workout.is_template = True
+ workout.save()
+
+ self.user_login('test')
+ response = self.client.get(reverse('manager:workout:overview'))
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(len(response.context['workouts']), 1)
+
+ response = self.client.get(reverse('manager:template:overview'))
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(len(response.context['workouts']), 0)
+
+ response = self.client.get(reverse('manager:template:public'))
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(len(response.context['workouts']), 0)
+
+ def test_access_overviews_public_templates(self):
+ """
+ Test accessing the different workout and template overviews - no public workouts
+ """
+ workout = Workout.objects.get(pk=1)
+ workout.is_template = True
+ workout.is_public = True
+ workout.save()
+
+ self.user_login('test')
+ response = self.client.get(reverse('manager:workout:overview'))
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(len(response.context['workouts']), 1)
+
+ response = self.client.get(reverse('manager:template:overview'))
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(len(response.context['workouts']), 0)
+
+ response = self.client.get(reverse('manager:template:public'))
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(len(response.context['workouts']), 1)
+
+
+class WorkoutTemplateDetailPageTestCase(WgerTestCase):
+ """
+ Test accessing the workout template detail page
+ """
+
+ def test_access_detail_for_workout(self):
+ """
+ Test accessing the template view for a regular workout
+ """
+ response = self.client.get(reverse('manager:template:view', kwargs={'pk': 3}))
+ self.assertEqual(response.status_code, 302)
+
+ self.user_login('test')
+ response = self.client.get(reverse('manager:template:view', kwargs={'pk': 3}))
+ self.assertEqual(response.status_code, 404)
+
+ self.user_login('admin')
+ response = self.client.get(reverse('manager:template:view', kwargs={'pk': 3}))
+ self.assertEqual(response.status_code, 404)
+
+
+ def test_access_detail_for_template(self):
+ """
+ Test accessing the template view for a template
+ """
+ workout = Workout.objects.get(pk=3)
+ workout.is_template = True
+ workout.save()
+
+ response = self.client.get(reverse('manager:template:view', kwargs={'pk': 3}))
+ self.assertEqual(response.status_code, 302)
+
+ self.user_login('test')
+ response = self.client.get(reverse('manager:template:view', kwargs={'pk': 3}))
+ self.assertEqual(response.status_code, 200)
+ self.user_logout()
+
+ self.user_login('admin')
+ response = self.client.get(reverse('manager:template:view', kwargs={'pk': 3}))
+ self.assertEqual(response.status_code, 403)
+
+
+ def test_access_detail_for_public_template(self):
+ """
+ Test accessing the template view for a template
+ """
+ workout = Workout.objects.get(pk=3)
+ workout.is_template = True
+ workout.is_public = True
+ workout.save()
+
+ response = self.client.get(reverse('manager:template:view', kwargs={'pk': 3}))
+ self.assertEqual(response.status_code, 302)
+
+ self.user_login('test')
+ response = self.client.get(reverse('manager:template:view', kwargs={'pk': 3}))
+ self.assertEqual(response.status_code, 200)
+ self.user_logout()
+
+ self.user_login('admin')
+ response = self.client.get(reverse('manager:template:view', kwargs={'pk': 3}))
+ self.assertEqual(response.status_code, 200)
+
+
+class SwitchViewsTestCase(WgerTestCase):
+ """
+ Test the views that convert a workout to a template and viceversa
+ """
+
+ def test_make_template(self):
+ """
+ Test accessing the template view for a regular workout
+ """
+ response = self.client.get(reverse('manager:workout:make-template', kwargs={'pk': 3}))
+ self.assertEqual(response.status_code, 403)
+
+ self.user_login('test')
+ response = self.client.get(reverse('manager:workout:make-template', kwargs={'pk': 3}))
+ self.assertEqual(response.status_code, 200)
+
+ self.user_login('admin')
+ response = self.client.get(reverse('manager:workout:make-template', kwargs={'pk': 3}))
+ self.assertEqual(response.status_code, 403)
+
+ def test_make_workout(self):
+ """
+ Test marking a template a workout again
+ """
+ response = self.client.get(reverse('manager:template:make-workout', kwargs={'pk': 3}))
+ self.assertEqual(response.status_code, 403)
+
+ self.user_login('test')
+ response = self.client.get(reverse('manager:template:make-workout', kwargs={'pk': 3}))
+ self.assertEqual(response.status_code, 302)
+
+ self.user_login('admin')
+ response = self.client.get(reverse('manager:template:make-workout', kwargs={'pk': 3}))
+ self.assertEqual(response.status_code, 403)
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index 3d72c6923..5cc1e4983 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -371,7 +371,7 @@ patterns_step = [
urlpatterns = [
path('', include((patterns_workout, 'workout'), namespace="workout")),
- path('templates/', include((patterns_templates, 'templates'), namespace="templates")),
+ path('template/', include((patterns_templates, 'template'), namespace="template")),
path('log/', include((patterns_log, 'log'), namespace="log")),
path('day/', include((patterns_day, 'day'), namespace="day")),
path('set/', include((patterns_set, 'set'), namespace="set")),
diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py
index 2c38d9b14..0123fa232 100644
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@ -78,16 +78,16 @@ def overview(request):
An overview of all the user's workouts
"""
- template_data = {}
+ context = {}
workouts = Workout.objects.filter(user=request.user)
(current_workout, schedule) = Schedule.objects.get_current_workout(request.user)
- template_data['workouts'] = workouts
- template_data['current_workout'] = current_workout
- template_data['title'] = _('Your workouts')
- template_data['template_overview'] = False
+ context['workouts'] = workouts
+ context['current_workout'] = current_workout
+ context['title'] = _('Your workouts')
+ context['template_overview'] = False
- return render(request, 'workout/overview.html', template_data)
+ return render(request, 'workout/overview.html', context)
@login_required
@@ -142,19 +142,22 @@ def view(request, pk):
return render(request, 'workout/view.html', template_data)
+@login_required()
def template_view(request, pk):
"""
Show the template with the given ID
"""
- context = {}
template = get_object_or_404(Workout.templates, pk=pk)
- user = template.user
- context['workout'] = template
- context['muscles'] = template.canonical_representation['muscles']
- context['is_owner'] = template.user == request.user
- context['owner_user'] = user
+ if not template.is_public and request.user != template.user:
+ return HttpResponseForbidden()
+ context = {
+ 'workout': template,
+ 'muscles': template.canonical_representation['muscles'],
+ 'is_owner': template.user == request.user,
+ 'owner_user': template.user,
+ }
return render(request, 'workout/template_view.html', context)
@@ -163,7 +166,6 @@ def copy_workout(request, pk):
"""
Makes a copy of a workout
"""
-
workout = get_object_or_404(Workout.both, pk=pk)
if not workout.is_public and request.user != workout.user: