Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Allow gym administrators to delete users

Roland Geider96086de8bb7a
diff --git a/extras/scripts/filter-fixtures.py b/extras/scripts/filter-fixtures.py
index 85b78cae5..9feb4ff33 100644
--- a/extras/scripts/filter-fixtures.py
+++ b/extras/scripts/filter-fixtures.py
@@ -71,3 +71,4 @@ filter_dump(data, ('config.gymconfig',), 'gym_config.json')
# Other
#
filter_dump(data, ('auth.group',), 'groups.json')
+filter_dump(data, ('auth.user',), 'users.json')
diff --git a/wger/config/tests/test_gym_config.py b/wger/config/tests/test_gym_config.py
index 16f4657c4..faf888691 100644
--- a/wger/config/tests/test_gym_config.py
+++ b/wger/config/tests/test_gym_config.py
@@ -45,7 +45,7 @@ class GymConfigTestCase(WorkoutManagerTestCase):
'email': '[email protected]',
'recaptcha_response_field': 'PASSED', }
self.client.post(reverse('core:registration'), registration_data)
- new_user = User.objects.get(pk=4)
+ new_user = User.objects.get(pk=14)
self.assertEqual(new_user.userprofile.gym, gym)
@@ -67,7 +67,7 @@ class GymConfigTestCase(WorkoutManagerTestCase):
'recaptcha_response_field': 'PASSED', }
self.client.post(reverse('core:registration'), registration_data)
- new_user = User.objects.get(pk=4)
+ new_user = User.objects.get(pk=14)
self.assertEqual(new_user.userprofile.gym_id, None)
def test_update_userprofile(self):
@@ -83,4 +83,4 @@ class GymConfigTestCase(WorkoutManagerTestCase):
gym_config.default_gym = gym
gym_config.save()
- self.assertEqual(UserProfile.objects.filter(gym=gym).count(), 3)
+ self.assertEqual(UserProfile.objects.filter(gym=gym).count(), 13)
diff --git a/wger/core/templates/gym/list.html b/wger/core/templates/gym/list.html
index f8011ab31..43c5ab636 100644
--- a/wger/core/templates/gym/list.html
+++ b/wger/core/templates/gym/list.html
@@ -35,8 +35,8 @@
{% block sidebar %}
-{% if perms.core.add_gym %}
<h4>{% trans "Options" %}</h4>
+{% if perms.core.add_gym %}
<p>
<a href="{% url 'core:gym:add' %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
@@ -49,9 +49,7 @@
</a>
</p>
{% endif %}
-
{% if perms.core.change_gymconfig %}
-<h4>{% trans "Default gym" %}</h4>
<p>
<a href="{% url 'config:gymconfig-edit' %}"
{% auto_link_css flavour %}>
@@ -64,4 +62,5 @@
</a>
</p>
{% endif %}
+
{% endblock %}
diff --git a/wger/core/templates/gym/member_list.html b/wger/core/templates/gym/member_list.html
index 002dc080a..1277ae38f 100644
--- a/wger/core/templates/gym/member_list.html
+++ b/wger/core/templates/gym/member_list.html
@@ -139,7 +139,7 @@
</table>
{% if perms.core.manage_gym %}
-<h3>{% trans "Options" %}</h3>
+<h4>{% trans "Options" %}</h4>
<p>
<a href="{% url 'core:gym:add-user' gym.pk %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
diff --git a/wger/core/templates/user/delete_account.html b/wger/core/templates/user/delete_account.html
index 73440c8df..b5078ad36 100644
--- a/wger/core/templates/user/delete_account.html
+++ b/wger/core/templates/user/delete_account.html
@@ -13,7 +13,7 @@
{% block content %}
-<form action="{% url 'core:user-delete' %}"
+<form action="{{form_action}}"
method="post"
class="form-horizontal"
role="form">
@@ -22,8 +22,10 @@
<h3 class="panel-title">{% trans "Are you sure?" %}</h3>
</div>
<div class="panel-body">
- <p>{% blocktrans %}This action will delete your user account.
-It will also irrevocably remove all your data and can't be undone. {% endblocktrans %}</p>
+ {% with username=user_delete|format_username %}
+ <p>{% blocktrans %}This action will delete the user account "{{username}}".
+It will also irrevocably remove all the data associated with it (workouts, logs, etc.)
+and can't be undone. {% endblocktrans %}{% endwith %}</p>
{% render_form_fields form 'tmp' False %}
{% render_form_submit 'Delete' 'danger' %}
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.html
index 237434f87..e570cc79b 100644
--- a/wger/core/templates/user/overview.html
+++ b/wger/core/templates/user/overview.html
@@ -97,6 +97,9 @@
<a href="{% url 'core:user-activate' current_user.pk %}">{% trans "Activate user"%}</a>
{% endif %}
</li>
+ <li>
+ <a href="{% url 'core:user-delete' current_user.pk %}" class="wger-modal-dialog">{% trans "Delete"%}</a>
+ </li>
</ul>
</div>
{% endif %}
diff --git a/wger/core/tests/test_delete_user.py b/wger/core/tests/test_delete_user.py
index 657f1f99d..d73446faa 100644
--- a/wger/core/tests/test_delete_user.py
+++ b/wger/core/tests/test_delete_user.py
@@ -54,7 +54,9 @@ class DeleteUserTestCase(WorkoutManagerTestCase):
# Correct user password
response = self.client.post(reverse('core:user-delete'), {'password': 'testtest'})
self.assertEqual(response.status_code, 302)
- if not fail:
+ if fail:
+ self.assertEqual(User.objects.filter(username='test').count(), 1)
+ else:
self.assertEqual(User.objects.filter(username='test').count(), 0)
def test_delete_user_logged_in(self):
@@ -69,3 +71,92 @@ class DeleteUserTestCase(WorkoutManagerTestCase):
Tests deleting the own account as an anonymous user
'''
self.delete_user(fail=True)
+
+
+class DeleteUserByAdminTestCase(WorkoutManagerTestCase):
+ '''
+ Tests deleting a user account by a gym administrator
+ '''
+
+ def delete_user(self, fail=False):
+ '''
+ Helper function
+ '''
+ response = self.client.get(reverse('core:user-delete', kwargs={'user_pk': 2}))
+ self.assertEqual(User.objects.filter(username='test').count(), 1)
+ if fail:
+ self.assertIn(response.status_code, (302, 403))
+ else:
+ self.assertEqual(response.status_code, 200)
+
+ # Wrong admin password
+ if not fail:
+ response = self.client.post(reverse('core:user-delete', kwargs={'user_pk': 2}),
+ {'password': 'blargh'})
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(User.objects.filter(username='test').count(), 1)
+
+ # Correct user password
+ response = self.client.post(reverse('core:user-delete', kwargs={'user_pk': 2}),
+ {'password': self.current_password})
+ if fail:
+ self.assertIn(response.status_code, (302, 403))
+ self.assertEqual(User.objects.filter(username='test').count(), 1)
+ else:
+ self.assertEqual(response.status_code, 302)
+ self.assertEqual(User.objects.filter(username='test').count(), 0)
+
+ def test_delete_user(self):
+ '''
+ Tests deleting the user account as a regular user
+ '''
+ self.user_login('test')
+ self.delete_user(fail=True)
+
+ def test_delete_user_trainer(self):
+ '''
+ Tests deleting the user account as a gym trainer
+ '''
+ self.user_login('trainer1')
+ self.delete_user(fail=True)
+
+ def test_delete_user_manager(self):
+ '''
+ Tests deleting the user account as a gym manager
+ '''
+ self.user_login('manager1')
+ self.delete_user(fail=False)
+
+ def test_delete_user_general_manager(self):
+ '''
+ Tests deleting the user account as a gym general manager
+ '''
+ self.user_login('general_manager1')
+ self.delete_user(fail=True)
+
+ def test_delete_user_trainer_other(self):
+ '''
+ Tests deleting the user account as a gym trainer of another gym
+ '''
+ self.user_login('trainer4')
+ self.delete_user(fail=True)
+
+ def test_delete_user_manager_other(self):
+ '''
+ Tests deleting the user account as a gym manager of another gym
+ '''
+ self.user_login('manager3')
+ self.delete_user(fail=True)
+
+ def test_delete_user_general_manager_other(self):
+ '''
+ Tests deleting the user account as a gym general manager of another gym
+ '''
+ self.user_login('general_manager2')
+ self.delete_user(fail=True)
+
+ def test_delete_user_anonymous(self):
+ '''
+ Tests deleting the user account as an anonymous user
+ '''
+ self.delete_user(fail=True)
diff --git a/wger/core/tests/test_gym.py b/wger/core/tests/test_gym.py
index 61d8705ae..6ebadb590 100644
--- a/wger/core/tests/test_gym.py
+++ b/wger/core/tests/test_gym.py
@@ -81,7 +81,7 @@ class GymTestCase(WorkoutManagerTestCase):
Tests that deleting a gym also removes it from all user profiles
'''
gym = Gym.objects.get(pk=1)
- self.assertEqual(UserProfile.objects.filter(gym=gym).count(), 2)
+ self.assertEqual(UserProfile.objects.filter(gym=gym).count(), 8)
gym.delete()
self.assertEqual(UserProfile.objects.filter(gym=gym).count(), 0)
diff --git a/wger/core/tests/test_temporary_users.py b/wger/core/tests/test_temporary_users.py
index 09a0de4bc..3fc5e3a1c 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=4)
+ user = User.objects.get(pk=14)
self.assertEqual(user.userprofile.is_temporary, True)
self.assertEqual(Workout.objects.filter(user=user).count(), 0)
diff --git a/wger/core/urls.py b/wger/core/urls.py
index d36b35623..5c402c1d3 100644
--- a/wger/core/urls.py
+++ b/wger/core/urls.py
@@ -69,6 +69,9 @@ urlpatterns = patterns('',
url(r'^user/delete$',
user.delete,
name='user-delete'),
+ url(r'^user/(?P<user_pk>\d+)/delete$',
+ user.delete,
+ name='user-delete'),
url(r'^user/logout$',
user.logout,
name='logout'),
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index 1a7be8121..441faa50c 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -63,19 +63,49 @@ def login(request):
@login_required()
-def delete(request):
+def delete(request, user_pk=None):
'''
- Delete the user account and all his data. Requires password confirmation first
+ Delete a user account and all his data, requires password confirmation first
+
+ If no user_pk is present, the user visiting the URL will be deleted, otherwise
+ a gym administrator is deleting a different user
'''
+
+ if user_pk:
+ user = get_object_or_404(User, pk=user_pk)
+ form_action = reverse('core:user-delete', kwargs={'user_pk': user_pk})
+
+ # Forbidden if the user has not enough rights, doesn't belong to the
+ # gym or is an admin as well
+ if (not request.user.has_perm('core.manage_gym')
+ or request.user.userprofile.gym_id != user.userprofile.gym_id
+ or user.has_perm('core.manage_gym')
+ or user.has_perm('core.gym_trainer')
+ or user.has_perm('core.manage_gyms')):
+ return HttpResponseForbidden()
+ else:
+ user = request.user
+ form_action = reverse('core:user-delete')
+
form = PasswordConfirmationForm(user=request.user)
+
if request.method == 'POST':
form = PasswordConfirmationForm(data=request.POST, user=request.user)
if form.is_valid():
- request.user.delete()
- django_logout(request)
- messages.success(request, _('Your account was successfully deleted'))
- return HttpResponseRedirect(reverse('software:features'))
- context = {'form': form}
+
+ user.delete()
+ messages.success(request,
+ _('Account "{0}" was successfully deleted').format(user.username))
+
+ if not user_pk:
+ django_logout(request)
+ return HttpResponseRedirect(reverse('software:features'))
+ else:
+ gym_pk = request.user.userprofile.gym_id
+ return HttpResponseRedirect(reverse('core:gym:user-list', kwargs={'pk': gym_pk}))
+ context = {'form': form,
+ 'user_delete': user,
+ 'form_action': form_action}
return render(request, 'user/delete_account.html', context)
diff --git a/wger/manager/fixtures/test-user-data.json b/wger/manager/fixtures/test-user-data.json
index 52c87ae1a..763f7bf6c 100644
--- a/wger/manager/fixtures/test-user-data.json
+++ b/wger/manager/fixtures/test-user-data.json
@@ -271,11 +271,251 @@
"last_login": "2013-03-30T00:23:21.592Z",
"groups": [],
"user_permissions": [],
- "password": "pbkdf2_sha256$10000$ncxgfFxHcKK3$oiXpDkxJ1ox765pRuMQh/s50yq7GUPayinBFb6ReeX4=",
+ "password": "pbkdf2_sha256$10000$ncxgfFxHcKK3$oiXpDkxJ1ox765pRuMQh/s50yq7GUPayinBFb6ReeX4=",
"email": "",
"date_joined": "2013-03-30T00:23:21.592Z"
}
},
+ {
+ "pk": 4,
+ "model": "auth.user",
+ "fields": {
+ "username": "trainer1",
+ "first_name": "",
+ "last_name": "",
+ "is_active": true,
+ "is_superuser": false,
+ "is_staff": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "groups": [],
+ "user_permissions": [
+ [
+ "gym_trainer",
+ "core",
+ "gym"
+ ]
+ ],
+ "password": "pbkdf2_sha256$12000$BaNi2p83rltB$fYAI0Y1Wxyo1DoQf8uJC6W1y3fK9HzmI7t8bN//Mzvo=",
+ "email": "",
+ "date_joined": "2013-03-30T00:23:21.592Z"
+ }
+ },
+ {
+ "pk": 5,
+ "model": "auth.user",
+ "fields": {
+ "username": "trainer2",
+ "first_name": "",
+ "last_name": "",
+ "is_active": true,
+ "is_superuser": false,
+ "is_staff": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "groups": [],
+ "user_permissions": [
+ [
+ "gym_trainer",
+ "core",
+ "gym"
+ ]
+ ],
+ "password": "pbkdf2_sha256$12000$fgvAIvZjOH3f$ufayZhSXYPIgEhAiimIv6coPAPWcE0MwLZKVOTsJMM0=",
+ "email": "",
+ "date_joined": "2013-03-30T00:23:21.592Z"
+ }
+ },
+ {
+ "pk": 6,
+ "model": "auth.user",
+ "fields": {
+ "username": "trainer3",
+ "first_name": "",
+ "last_name": "",
+ "is_active": true,
+ "is_superuser": false,
+ "is_staff": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "groups": [],
+ "user_permissions": [
+ [
+ "gym_trainer",
+ "core",
+ "gym"
+ ]
+ ],
+ "password": "pbkdf2_sha256$12000$IsWVvB7BuF2p$ZwLPKiGB5wP6XVx5qYI2hKu5CWODQX3gVUDvXEr1XqM=",
+ "email": "",
+ "date_joined": "2013-03-30T00:23:21.592Z"
+ }
+ },
+ {
+ "pk": 7,
+ "model": "auth.user",
+ "fields": {
+ "username": "trainer4",
+ "first_name": "",
+ "last_name": "",
+ "is_active": true,
+ "is_superuser": false,
+ "is_staff": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "groups": [],
+ "user_permissions": [
+ [
+ "gym_trainer",
+ "core",
+ "gym"
+ ]
+ ],
+ "password": "pbkdf2_sha256$12000$U11MFXGmVZCy$znXUYY6Nt9t25mqGaCumxe9qe91pjQSr3fNWQb+SZms=",
+ "email": "",
+ "date_joined": "2013-03-30T00:23:21.592Z"
+ }
+ },
+ {
+ "pk": 8,
+ "model": "auth.user",
+ "fields": {
+ "username": "trainer5",
+ "first_name": "",
+ "last_name": "",
+ "is_active": true,
+ "is_superuser": false,
+ "is_staff": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "groups": [],
+ "user_permissions": [
+ [
+ "gym_trainer",
+ "core",
+ "gym"
+ ]
+ ],
+ "password": "pbkdf2_sha256$12000$N1LjFaFdFKXD$Bd4rFH4+pXY9R3xOOE6rLfFLZ9Y7zri+UmzAEWgADWE=",
+ "email": "",
+ "date_joined": "2013-03-30T00:23:21.592Z"
+ }
+ },
+ {
+ "pk": 9,
+ "model": "auth.user",
+ "fields": {
+ "username": "manager1",
+ "first_name": "",
+ "last_name": "",
+ "is_active": true,
+ "is_superuser": false,
+ "is_staff": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "groups": [],
+ "user_permissions": [
+ [
+ "manage_gym",
+ "core",
+ "gym"
+ ]
+ ],
+ "password": "pbkdf2_sha256$12000$YHyCIzh0CYNt$kEeqDYK9mw4d9+X5uxpav/rVAFEQuJyT2GRaTdtpaFI=",
+ "email": "",
+ "date_joined": "2013-03-30T00:23:21.592Z"
+ }
+ },
+ {
+ "pk": 10,
+ "model": "auth.user",
+ "fields": {
+ "username": "manager2",
+ "first_name": "",
+ "last_name": "",
+ "is_active": true,
+ "is_superuser": false,
+ "is_staff": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "groups": [],
+ "user_permissions": [
+ [
+ "manage_gym",
+ "core",
+ "gym"
+ ]
+ ],
+ "password": "pbkdf2_sha256$12000$JpQW8y8VEnIJ$LgBr+wCAU00/Lpec0Iq/og8oqEOT0yS2C8C1UakI1Uo=",
+ "email": "",
+ "date_joined": "2013-03-30T00:23:21.592Z"
+ }
+ },
+ {
+ "pk": 11,
+ "model": "auth.user",
+ "fields": {
+ "username": "manager3",
+ "first_name": "",
+ "last_name": "",
+ "is_active": true,
+ "is_superuser": false,
+ "is_staff": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "groups": [],
+ "user_permissions": [
+ [
+ "manage_gym",
+ "core",
+ "gym"
+ ]
+ ],
+ "password": "pbkdf2_sha256$12000$lHge7s7afhrb$Nb5M0jcoSX0ZbT3P70D4XDtke37u+NKdoBfXNd9LFng=",
+ "email": "",
+ "date_joined": "2013-03-30T00:23:21.592Z"
+ }
+ },
+ {
+ "pk": 12,
+ "model": "auth.user",
+ "fields": {
+ "username": "general_manager1",
+ "first_name": "",
+ "last_name": "",
+ "is_active": true,
+ "is_superuser": false,
+ "is_staff": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "groups": [],
+ "user_permissions": [
+ [
+ "manage_gyms",
+ "core",
+ "gym"
+ ]
+ ],
+ "password": "pbkdf2_sha256$12000$q1ZLvhPFKbRp$Q1dgERaIC1YSWdWI8XwxwDlP0J5c52n+Nu2UFKRT0Mc=",
+ "email": "",
+ "date_joined": "2013-03-30T00:23:21.592Z"
+ }
+ },
+ {
+ "pk": 13,
+ "model": "auth.user",
+ "fields": {
+ "username": "general_manager2",
+ "first_name": "",
+ "last_name": "",
+ "is_active": true,
+ "is_superuser": false,
+ "is_staff": false,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "groups": [],
+ "user_permissions": [
+ [
+ "manage_gyms",
+ "core",
+ "gym"
+ ]
+ ],
+ "password": "pbkdf2_sha256$12000$gy3Rnm5zmJFb$3yjL9nKmDkwWlZwYVTUfUe/E2MPcWbYdrucauAx78lw=",
+ "email": "",
+ "date_joined": "2013-03-30T00:23:21.592Z"
+ }
+ },
{
"pk": 1,
"model": "core.userprofile",
@@ -357,5 +597,285 @@
"notification_language": 2,
"gym": 2
}
+ },
+ {
+ "pk": 4,
+ "model": "core.userprofile",
+ "fields": {
+ "is_temporary": false,
+ "show_comments": false,
+ "show_english_ingredients": false,
+ "user": 4,
+ "gender": "1",
+ "age": 20,
+ "sport_intensity": "3",
+ "calories": 3500,
+ "height": 180,
+ "sport_hours": 6,
+ "sleep_hours": 7,
+ "work_intensity": "1",
+ "freetime_intensity": "1",
+ "work_hours": 8,
+ "freetime_hours": 8,
+ "workout_reminder_active": true,
+ "workout_reminder": 14,
+ "workout_duration": 12,
+ "notification_language": 2,
+ "timer_active": true,
+ "timer_pause": 90,
+ "gym": 1
+ }
+ },
+ {
+ "pk": 5,
+ "model": "core.userprofile",
+ "fields": {
+ "is_temporary": false,
+ "show_comments": false,
+ "show_english_ingredients": false,
+ "user": 5,
+ "gender": "1",
+ "age": 20,
+ "sport_intensity": "3",
+ "calories": 3500,
+ "height": 180,
+ "sport_hours": 6,
+ "sleep_hours": 7,
+ "work_intensity": "1",
+ "freetime_intensity": "1",
+ "work_hours": 8,
+ "freetime_hours": 8,
+ "workout_reminder_active": true,
+ "workout_reminder": 14,
+ "workout_duration": 12,
+ "notification_language": 2,
+ "timer_active": true,
+ "timer_pause": 90,
+ "gym": 1
+ }
+ },
+ {
+ "pk": 6,
+ "model": "core.userprofile",
+ "fields": {
+ "is_temporary": false,
+ "show_comments": false,
+ "show_english_ingredients": false,
+ "user": 6,
+ "gender": "1",
+ "age": 20,
+ "sport_intensity": "3",
+ "calories": 3500,
+ "height": 180,
+ "sport_hours": 6,
+ "sleep_hours": 7,
+ "work_intensity": "1",
+ "freetime_intensity": "1",
+ "work_hours": 8,
+ "freetime_hours": 8,
+ "workout_reminder_active": true,
+ "workout_reminder": 14,
+ "workout_duration": 12,
+ "notification_language": 2,
+ "timer_active": true,
+ "timer_pause": 90,
+ "gym": 1
+ }
+ },
+ {
+ "pk": 7,
+ "model": "core.userprofile",
+ "fields": {
+ "is_temporary": false,
+ "show_comments": false,
+ "show_english_ingredients": false,
+ "user": 7,
+ "gender": "1",
+ "age": 20,
+ "sport_intensity": "3",
+ "calories": 3500,
+ "height": 180,
+ "sport_hours": 6,
+ "sleep_hours": 7,
+ "work_intensity": "1",
+ "freetime_intensity": "1",
+ "work_hours": 8,
+ "freetime_hours": 8,
+ "workout_reminder_active": true,
+ "workout_reminder": 14,
+ "workout_duration": 12,
+ "notification_language": 2,
+ "timer_active": true,
+ "timer_pause": 90,
+ "gym": 2
+ }
+ },
+ {
+ "pk": 8,
+ "model": "core.userprofile",
+ "fields": {
+ "is_temporary": false,
+ "show_comments": false,
+ "show_english_ingredients": false,
+ "user": 8,
+ "gender": "1",
+ "age": 20,
+ "sport_intensity": "3",
+ "calories": 3500,
+ "height": 180,
+ "sport_hours": 6,
+ "sleep_hours": 7,
+ "work_intensity": "1",
+ "freetime_intensity": "1",
+ "work_hours": 8,
+ "freetime_hours": 8,
+ "workout_reminder_active": true,
+ "workout_reminder": 14,
+ "workout_duration": 12,
+ "notification_language": 2,
+ "timer_active": true,
+ "timer_pause": 90,
+ "gym": 2
+ }
+ },
+ {
+ "pk": 9,
+ "model": "core.userprofile",
+ "fields": {
+ "is_temporary": false,
+ "show_comments": false,
+ "show_english_ingredients": false,
+ "user": 9,
+ "gender": "1",
+ "age": 20,
+ "sport_intensity": "3",
+ "calories": 3500,
+ "height": 180,
+ "sport_hours": 6,
+ "sleep_hours": 7,
+ "work_intensity": "1",
+ "freetime_intensity": "1",
+ "work_hours": 8,
+ "freetime_hours": 8,
+ "workout_reminder_active": true,
+ "workout_reminder": 14,
+ "workout_duration": 12,
+ "notification_language": 2,
+ "timer_active": true,
+ "timer_pause": 90,
+ "gym": 1
+ }
+ },
+ {
+ "pk": 10,
+ "model": "core.userprofile",
+ "fields": {
+ "is_temporary": false,
+ "show_comments": false,
+ "show_english_ingredients": false,
+ "user": 10,
+ "gender": "1",
+ "age": 20,
+ "sport_intensity": "3",
+ "calories": 3500,
+ "height": 180,
+ "sport_hours": 6,
+ "sleep_hours": 7,
+ "work_intensity": "1",
+ "freetime_intensity": "1",
+ "work_hours": 8,
+ "freetime_hours": 8,
+ "workout_reminder_active": true,
+ "workout_reminder": 14,
+ "workout_duration": 12,
+ "notification_language": 2,
+ "timer_active": true,
+ "timer_pause": 90,
+ "gym": 1
+ }
+ },
+ {
+ "pk": 11,
+ "model": "core.userprofile",
+ "fields": {
+ "is_temporary": false,
+ "show_comments": false,
+ "show_english_ingredients": false,
+ "user": 11,
+ "gender": "1",
+ "age": 20,
+ "sport_intensity": "3",
+ "calories": 3500,
+ "height": 180,
+ "sport_hours": 6,
+ "sleep_hours": 7,
+ "work_intensity": "1",
+ "freetime_intensity": "1",
+ "work_hours": 8,
+ "freetime_hours": 8,
+ "workout_reminder_active": true,
+ "workout_reminder": 14,
+ "workout_duration": 12,
+ "notification_language": 2,
+ "timer_active": true,
+ "timer_pause": 90,
+ "gym": 2
+ }
+ },
+ {
+ "pk": 12,
+ "model": "core.userprofile",
+ "fields": {
+ "is_temporary": false,
+ "show_comments": false,
+ "show_english_ingredients": false,
+ "user": 12,
+ "gender": "1",
+ "age": 20,
+ "sport_intensity": "3",
+ "calories": 3500,
+ "height": 180,
+ "sport_hours": 6,
+ "sleep_hours": 7,
+ "work_intensity": "1",
+ "freetime_intensity": "1",
+ "work_hours": 8,
+ "freetime_hours": 8,
+ "workout_reminder_active": true,
+ "workout_reminder": 14,
+ "workout_duration": 12,
+ "notification_language": 2,
+ "timer_active": true,
+ "timer_pause": 90,
+ "gym": 1
+ }
+ },
+ {
+ "pk": 13,
+ "model": "core.userprofile",
+ "fields": {
+ "is_temporary": false,
+ "show_comments": false,
+ "show_english_ingredients": false,
+ "user": 13,
+ "gender": "1",
+ "age": 20,
+ "sport_intensity": "3",
+ "calories": 3500,
+ "height": 180,
+ "sport_hours": 6,
+ "sleep_hours": 7,
+ "work_intensity": "1",
+ "freetime_intensity": "1",
+ "work_hours": 8,
+ "freetime_hours": 8,
+ "workout_reminder_active": true,
+ "workout_reminder": 14,
+ "workout_duration": 12,
+ "notification_language": 2,
+ "timer_active": true,
+ "timer_pause": 90,
+ "gym": 2
+ }
}
]
diff --git a/wger/manager/tests/testcase.py b/wger/manager/tests/testcase.py
index 64ff167f1..b0d0ec69b 100644
--- a/wger/manager/tests/testcase.py
+++ b/wger/manager/tests/testcase.py
@@ -68,6 +68,7 @@ class BaseTestCase(object):
'test-workout-session',
'test-schedules')
current_user = 'anonymous'
+ current_password = ''
is_mobile = False
def setUp(self):
@@ -110,8 +111,10 @@ class WorkoutManagerTestCase(BaseTestCase, TestCase):
'''
Login the user, by default as 'admin'
'''
- self.client.login(username=user, password='%(user)s%(user)s' % {'user': user})
+ password = '{0}{0}'.format(user)
+ self.client.login(username=user, password=password)
self.current_user = user
+ self.current_password = password
def user_logout(self):
'''