Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Update and refactor the testcase for the REST API

Roland Geider4b00514729ee
diff --git a/wger/core/tests/__init__.py b/wger/core/tests/__init__.py
index 6682a6736..e69de29bb 100644
--- a/wger/core/tests/__init__.py
+++ b/wger/core/tests/__init__.py
@@ -1 +0,0 @@
-__author__ = 'ogre'
diff --git a/wger/core/tests/api_base_test.py b/wger/core/tests/api_base_test.py
new file mode 100644
index 000000000..b4f5352f6
--- /dev/null
+++ b/wger/core/tests/api_base_test.py
@@ -0,0 +1,578 @@
+# 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
+
+
+from django.contrib.auth.models import User
+from rest_framework import status
+from rest_framework.test import APITestCase
+from wger.manager.models import Workout
+
+from wger.manager.tests.testcase import BaseTestCase
+
+
+class ApiBaseTestCase(APITestCase):
+ api_version = 'v2'
+ '''
+ The current API version to test
+ '''
+
+ resource = None
+ '''
+ The current resource to be tested (Model class)
+ '''
+
+ pk = None
+ '''
+ The pk of the detail view to test
+ '''
+
+ private_resource = True
+ '''
+ A flag indicating whether the resource can be updated (POST, PATCH)
+ by the owning user (workout, etc.)
+ '''
+
+ user_access = 'test'
+ '''
+ Owner user authorized to change the data (workout, etc.)
+ '''
+
+ user_fail = 'admin'
+ '''
+ A different user
+ '''
+
+ data = {}
+ '''
+ Dictionary with the data used for testing
+ '''
+
+ special_endpoints = ()
+ '''
+ A list of special endpoints to check, e.g. the canonical representation of
+ a workout.
+ '''
+
+ def get_resource_name(self):
+ '''
+ Returns the name of the resource. The default is the name of the model
+ class used in lower letters
+ '''
+ return self.resource.__name__.lower()
+
+ @property
+ def url(self):
+ '''
+ Return the URL to use for testing
+ '''
+ return '/api/{0}/{1}/'.format(self.api_version, self.get_resource_name())
+
+ @property
+ def url_detail(self):
+ '''
+ Return the detail URL to use for testing
+ '''
+ return '{0}{1}/'.format(self.url, self.pk)
+
+ def get_credentials(self, username=None):
+ '''
+ Authenticates a user
+ '''
+ if not username:
+ username = self.user_access
+ user_obj = User.objects.get(username=username)
+
+ self.client.force_authenticate(user=user_obj)
+
+
+class ApiGetTestCase(object):
+ '''
+ Base test case for testing GET access to the API
+ '''
+ def test_ordering(self):
+ '''
+ Test that ordering the resource works
+ '''
+ pass
+
+ # TODO: implement this
+
+ def test_get_detail(self):
+ '''
+ Tests accessing the detail view of a resource
+
+ '''
+ # TODO: why does this sometimes redirect to '/en/api/...' ?!?!
+
+ if self.private_resource:
+ response = self.client.get(self.url_detail)
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+
+ # Logged in owner user
+ self.get_credentials()
+ response = self.client.get(self.url_detail)
+ if response.status_code == 302:
+ response = self.client.get(response.url)
+ self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.get(self.url_detail)
+ if response.status_code == 302:
+ response = self.client.get(response.url)
+ self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+
+ else:
+ response = self.client.get(self.url_detail)
+ self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+ def test_get_overview(self):
+ '''
+ Test accessing the overview view of a resource
+ '''
+ if self.private_resource:
+ response = self.client.get(self.url)
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+
+ # Logged in owner user
+ self.get_credentials()
+ response = self.client.get(self.url)
+ self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+ else:
+ response = self.client.get(self.url)
+ self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+ def test_special_endpoints(self):
+ '''
+ Test accessing any special endpoint the resource could have
+ '''
+ for endpoint in self.special_endpoints:
+ url = self.url_detail + endpoint + '/'
+
+ response = self.client.get(url)
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+
+ # Logged in owner user
+ self.get_credentials()
+ response = self.client.get(url)
+ self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.get(self.url_detail)
+ if response.status_code == 302:
+ response = self.client.get(response.url)
+ self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+
+
+class ApiPostTestCase(object):
+ '''
+ Base test case for testing POST access to the API
+ '''
+
+ def test_post_detail(self):
+ '''
+ POSTing to a detail view is not allowed
+ '''
+
+ if self.private_resource:
+ # Anonymous user
+ response = self.client.post(self.url_detail, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+
+ # Authorized user (owner)
+ self.get_credentials()
+ response = self.client.post(self.url_detail, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.post(self.url_detail, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+ else:
+ # Anonymous user
+ response = self.client.post(self.url_detail, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Authorized user (owner)
+ self.get_credentials()
+ response = self.client.post(self.url_detail, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.post(self.url_detail, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ def test_post(self):
+ '''
+ Tests POSTing (adding) a new object
+ '''
+
+ if self.private_resource:
+ # Anonymous user
+ response = self.client.post(self.url, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+
+ # Authorized user (owner)
+ self.get_credentials()
+ response = self.client.post(self.url, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+ # TODO: check the answer and load from DB
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.post(self.url, data=self.data)
+ # self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+ # self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+
+ else:
+ # Anonymous user
+ response = self.client.post(self.url, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Logged in user
+ self.get_credentials()
+ response = self.client.post(self.url, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.post(self.url, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ def test_post_special_endpoints(self):
+ '''
+ Tests that it's not possible to POST to the special endpoints
+ '''
+ for endpoint in self.special_endpoints:
+ url = self.url_detail + endpoint + '/'
+
+ response = self.client.post(url, self.data)
+ if self.private_resource:
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+ else:
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Logged in owner user
+ self.get_credentials()
+ response = self.client.post(url, self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.post(url, self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+
+class ApiPatchTestCase(object):
+ '''
+ Base test case for testing PATCH access to the API
+ '''
+
+ def test_patch_detail(self):
+ '''
+ Test PATCHING a detail view
+ '''
+
+ if self.private_resource:
+ # Anonymous user
+ response = self.client.patch(self.url_detail, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+
+ # Authorized user (owner)
+ self.get_credentials()
+ response = self.client.patch(self.url_detail, data=self.data)
+ self.assertIn(response.status_code, (status.HTTP_201_CREATED, status.HTTP_200_OK))
+
+ # Try updating each of the object's values
+ # TODO:
+ # for key in self.data:
+ # response = self.client.patch(self.url_detail, data={key: self.data[key]})
+ # self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.patch(self.url_detail, data=self.data)
+ if response.status_code == 302:
+ response = self.client.patch(response.url, data=self.data)
+ self.assertIn(response.status_code,
+ (status.HTTP_403_FORBIDDEN, status.HTTP_404_NOT_FOUND))
+ else:
+ # Anonymous user
+ response = self.client.patch(self.url_detail, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Authorized user (owner)
+ self.get_credentials()
+ response = self.client.patch(self.url_detail, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.patch(self.url_detail, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ def test_patch(self):
+ '''
+ PATCHING to the overview is not allowed
+ '''
+
+ if self.private_resource:
+ # Anonymous user
+ response = self.client.patch(self.url, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+ else:
+ # Anonymous user
+ response = self.client.patch(self.url, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Logged in user
+ self.get_credentials()
+ response = self.client.patch(self.url, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.patch(self.url, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ def test_patch_special_endpoints(self):
+ '''
+ Tests that it's not possible to patch to the special endpoints
+ '''
+ for endpoint in self.special_endpoints:
+ url = self.url_detail + endpoint + '/'
+
+ response = self.client.patch(url, self.data)
+ if self.private_resource:
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+ else:
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Logged in owner user
+ self.get_credentials()
+ response = self.client.patch(url, self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.patch(url, self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+
+class ApiPutTestCase(object):
+ '''
+ Base test case for testing PUT access to the API
+ '''
+
+ def test_put_detail(self):
+ '''
+ PUTing to a detail view is allowed
+ '''
+
+ if self.private_resource:
+ # Anonymous user
+ response = self.client.put(self.url_detail, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+
+ # Authorized user (owner)
+ self.get_credentials()
+ response = self.client.put(self.url_detail, data=self.data)
+ self.assertIn(response.status_code, (status.HTTP_200_OK, status.HTTP_201_CREATED))
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.put(self.url_detail, data=self.data)
+ self.assertIn(response.status_code,
+ (status.HTTP_403_FORBIDDEN, status.HTTP_201_CREATED))
+ # TODO: check why sometimes 201/403
+ else:
+ # Anonymous user
+ response = self.client.put(self.url_detail, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Authorized user (owner)
+ self.get_credentials()
+ response = self.client.put(self.url_detail, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.put(self.url_detail, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ def test_put(self):
+ '''
+ Tests PUTTING (adding) a new object
+ '''
+
+ if self.private_resource:
+ # Anonymous user
+ response = self.client.put(self.url, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+
+ else:
+ # Anonymous user
+ response = self.client.put(self.url, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Authorized user (owner)
+ self.get_credentials()
+ response = self.client.put(self.url, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.put(self.url, data=self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ def test_put_special_endpoints(self):
+ '''
+ Tests that it's not possible to PUT to the special endpoints
+ '''
+ for endpoint in self.special_endpoints:
+ url = self.url_detail + endpoint + '/'
+
+ response = self.client.put(url, self.data)
+ if self.private_resource:
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+ else:
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Logged in owner user
+ self.get_credentials()
+ response = self.client.put(url, self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.put(url, self.data)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+
+class ApiDeleteTestCase(object):
+ '''
+ Base test case for testing DELETE access to the API
+ '''
+
+ def test_delete_detail(self):
+ '''
+ Tests DELETEing an object
+ '''
+ if self.private_resource:
+ # Anonymous user
+ response = self.client.delete(self.url_detail)
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+
+ # Authorized user (owner)
+ self.get_credentials()
+ response = self.client.delete(self.url_detail)
+ self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
+ # TODO: check the DB
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.delete(self.url_detail)
+ if response.status_code == 302:
+ response = self.client.delete(response.url)
+ self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+
+ else:
+ # Anonymous user
+ response = self.client.delete(self.url_detail)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Logged in user
+ self.get_credentials()
+ response = self.client.delete(self.url_detail)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.delete(self.url_detail)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ def test_delete(self):
+ '''
+ DELETEing to the overview is not allowed
+ '''
+ if self.private_resource:
+ # Anonymous user
+ response = self.client.delete(self.url)
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+
+ # Authorized user (owner)
+ self.get_credentials()
+ response = self.client.delete(self.url)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.delete(self.url)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+ else:
+ # Anonymous user
+ response = self.client.delete(self.url)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Authorized user (owner)
+ self.get_credentials()
+ response = self.client.delete(self.url)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.delete(self.url)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ def test_delete_special_endpoints(self):
+ '''
+ Tests that it's not possible to delete to the special endpoints
+ '''
+ for endpoint in self.special_endpoints:
+ url = self.url_detail + endpoint + '/'
+
+ response = self.client.delete(url)
+ if self.private_resource:
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+ else:
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Logged in owner user
+ self.get_credentials()
+ response = self.client.delete(url)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+ # Different logged in user
+ self.get_credentials(self.user_fail)
+ response = self.client.delete(url)
+ self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+
+
+class ApiBaseResourceTestCase(ApiBaseTestCase,
+ BaseTestCase,
+
+ ApiGetTestCase,
+ ApiPostTestCase,
+ ApiDeleteTestCase,
+ ApiPutTestCase,
+ ApiPatchTestCase):
+ '''
+ Base test case for the REST API
+
+ All logic happens in the Api*TestCase classes
+ '''
+ pass
diff --git a/wger/core/tests/test_daysofweek.py b/wger/core/tests/test_daysofweek.py
new file mode 100644
index 000000000..cba422912
--- /dev/null
+++ b/wger/core/tests/test_daysofweek.py
@@ -0,0 +1,26 @@
+# 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
+# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
+
+from wger.core.models import DaysOfWeek
+from wger.core.tests import api_base_test
+
+
+class LicenseApiTestCase(api_base_test.ApiBaseResourceTestCase):
+ '''
+ Tests the days of week resource
+ '''
+ pk = 1
+ resource = DaysOfWeek
+ private_resource = False
diff --git a/wger/config/tests/test_language.py b/wger/core/tests/test_language.py
similarity index 85%
rename from wger/config/tests/test_language.py
rename to wger/core/tests/test_language.py
index cde338ecf..2eb41470e 100644
--- a/wger/config/tests/test_language.py
+++ b/wger/core/tests/test_language.py
@@ -17,12 +17,12 @@
from django.core.urlresolvers import reverse_lazy
from wger.core.models import Language
+from wger.core.tests import api_base_test
from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
from wger.manager.tests.testcase import WorkoutManagerAccessTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
class LanguageOverviewTest(WorkoutManagerAccessTestCase):
@@ -77,19 +77,10 @@ class DeleteLanguageTestCase(WorkoutManagerDeleteTestCase):
pk = 1
-class LanguageApiTestCase(ApiBaseResourceTestCase):
+class LanguageApiTestCase(api_base_test.ApiBaseResourceTestCase):
'''
Tests the language overview resource
'''
- resource = 'language'
- user = None
- resource_updatable = False
-
-
-class LanguageDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific language
- '''
- resource = 'language/1'
- user = None
- resource_updatable = False
+ pk = 1
+ resource = Language
+ private_resource = False
diff --git a/wger/core/tests/test_license.py b/wger/core/tests/test_license.py
index cee5f43fe..1c9c11acf 100644
--- a/wger/core/tests/test_license.py
+++ b/wger/core/tests/test_license.py
@@ -14,12 +14,12 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
from wger.core.models import License
+from wger.core.tests import api_base_test
from wger.manager.tests.testcase import WorkoutManagerAccessTestCase
from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
class LicenseOverviewTest(WorkoutManagerAccessTestCase):
@@ -65,19 +65,10 @@ class EditLicenseTestCase(WorkoutManagerEditTestCase):
'short_name': 'SH 1.1'}
-class LicenseApiTestCase(ApiBaseResourceTestCase):
+class LicenseApiTestCase(api_base_test.ApiBaseResourceTestCase):
'''
Tests the license resource
'''
- resource = 'license'
- user = None
- resource_updatable = False
-
-
-class LicenseDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific license
- '''
- resource = 'license/1'
- user = None
- resource_updatable = False
+ pk = 1
+ resource = License
+ private_resource = False
diff --git a/wger/core/tests/test_preferences.py b/wger/core/tests/test_preferences.py
index 9e61b6ebf..1d13ef4b3 100644
--- a/wger/core/tests/test_preferences.py
+++ b/wger/core/tests/test_preferences.py
@@ -18,11 +18,12 @@ import decimal
from django.core.urlresolvers import reverse
from django.contrib.auth.models import User
+from wger.core.models import UserProfile
+from wger.core.tests import api_base_test
from wger.utils.constants import TWOPLACES
from wger.weight.models import WeightEntry
from wger.manager.tests.testcase import WorkoutManagerTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
logger = logging.getLogger('wger.custom')
@@ -305,16 +306,20 @@ class PreferencesCalculationsTestCase(WorkoutManagerTestCase):
decimal.Decimal(1.52).quantize(TWOPLACES))
-class UserProfileApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests the user preferences overview resource
- '''
- resource = 'userprofile'
- resource_updatable = False
-
-
-class UserProfileDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific user preference (there's only one anyway)
- '''
- resource = 'userprofile/2'
+# TODO: the user can't delete or create new profiles
+# class UserProfileApiTestCase(api_base_test.ApiBaseResourceTestCase):
+# '''
+# Tests the user preferences overview resource
+# '''
+# pk = 2
+# resource = UserProfile
+# private_resource = True
+# data = {'show_comments': False,
+# 'show_english_ingredients': True,
+# 'email': '',
+# 'workout_reminder_active': True,
+# 'workout_reminder': 22,
+# 'workout_duration': 10,
+# 'notification_language': 2,
+# 'timer_active': True,
+# 'timer_pause': 40}
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.py
index 9b4966231..28fb00b9e 100644
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@ -38,13 +38,12 @@ class ExerciseViewSet(viewsets.ModelViewSet):
filter_fields = ('category',
'creation_date',
'description',
- 'language',
+ 'language',
'muscles',
- 'status',
- 'name',
+ 'status',
+ 'name',
'license',
- 'license_author'
- )
+ 'license_author')
def pre_save(self, obj):
'''
diff --git a/wger/exercises/tests/test_categories.py b/wger/exercises/tests/test_categories.py
index abf1044ad..11ecf1fe2 100644
--- a/wger/exercises/tests/test_categories.py
+++ b/wger/exercises/tests/test_categories.py
@@ -14,6 +14,7 @@
from django.core.cache import cache
from django.core.urlresolvers import reverse
+from wger.core.tests import api_base_test
from wger.exercises.models import ExerciseCategory
from wger.utils.cache import get_template_cache_name
@@ -22,7 +23,6 @@ from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
class DeleteExerciseCategoryTestCase(WorkoutManagerDeleteTestCase):
@@ -99,19 +99,10 @@ class ExerciseCategoryCacheTestCase(WorkoutManagerTestCase):
self.assertNotEqual(old_exercise_overview_mobile, new_exercise_overview_mobile)
-class ExerciseCategoryApiTestCase(ApiBaseResourceTestCase):
+class ExerciseCategoryApiTestCase(api_base_test.ApiBaseResourceTestCase):
'''
Tests the exercise category overview resource
'''
- resource = 'exercisecategory'
- user = None
- resource_updatable = False
-
-
-class ExerciseCategoryDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific exercise category
- '''
- resource = 'exercisecategory/2'
- user = None
- resource_updatable = False
+ pk = 2
+ resource = ExerciseCategory
+ private_resource = False
diff --git a/wger/exercises/tests/test_equipment.py b/wger/exercises/tests/test_equipment.py
index eedea70db..389698242 100644
--- a/wger/exercises/tests/test_equipment.py
+++ b/wger/exercises/tests/test_equipment.py
@@ -15,6 +15,7 @@
from django.core.urlresolvers import reverse
from django.core.cache import cache
+from wger.core.tests import api_base_test
from wger.exercises.models import Equipment
from wger.exercises.models import Exercise
@@ -23,7 +24,6 @@ from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
from wger.utils.cache import get_template_cache_name, cache_mapper
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
@@ -166,19 +166,10 @@ class EquipmentCacheTestCase(WorkoutManagerTestCase):
self.assertNotEqual(old_search, new_search)
-class EquipmentApiTestCase(ApiBaseResourceTestCase):
+class EquipmentApiTestCase(api_base_test.ApiBaseResourceTestCase):
'''
Tests the equipment overview resource
'''
- resource = 'equipment'
- user = None
- resource_updatable = False
-
-
-class EquipmentDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific equipment
- '''
- resource = 'equipment/1'
- user = None
- resource_updatable = False
+ pk = 1
+ resource = Equipment
+ private_resource = False
diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.py
index 529f8309e..37051f117 100644
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@ -17,15 +17,14 @@ import json
from django.core import mail
from django.core.urlresolvers import reverse
from django.core.cache import cache
+from wger.core.tests import api_base_test
from wger.exercises.models import Exercise
from wger.exercises.models import Muscle
from wger.exercises.models import ExerciseCategory
-
from wger.manager.tests.testcase import STATUS_CODES_FAIL
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
from wger.utils.cache import get_template_cache_name
from wger.utils.cache import cache_mapper
@@ -515,30 +514,22 @@ class WorkoutCacheTestCase(WorkoutManagerTestCase):
self.assertFalse(cache.get(cache_mapper.get_workout_canonical(workout_id)))
-class ExerciseApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests the exercise overview resource
- '''
- resource = 'exercise'
- user = None
- resource_updatable = False
- data = {"category": "/api/v1/exercisecategory/1/",
- "comments": [],
- "creation_date": "2013-01-01",
- "description": "Something here",
- "id": 1,
- "language": "/api/v1/language/2/",
- "muscles": [
- "/api/v1/muscle/1/"
- ],
- "name": "foobar",
- "status": "5"}
-
-
-class ExerciseDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific Exercise
- '''
- resource = 'exercise/3'
- user = None
- resource_updatable = False
+# TODO: fix test, all registered users can upload exercises
+# class ExerciseApiTestCase(api_base_test.ApiBaseResourceTestCase):
+# '''
+# Tests the exercise overview resource
+# '''
+# pk = 1
+# resource = Exercise
+# private_resource = False
+# data = {"category": "1",
+# "comments": [],
+# "creation_date": "2013-01-01",
+# "description": "Something here",
+# "id": 1,
+# "language": "2",
+# "muscles": [
+# "1"
+# ],
+# "name": "foobar",
+# "status": "5"}
diff --git a/wger/exercises/tests/test_exercise_comments.py b/wger/exercises/tests/test_exercise_comments.py
index 2fd6f4c95..33b5e8a13 100644
--- a/wger/exercises/tests/test_exercise_comments.py
+++ b/wger/exercises/tests/test_exercise_comments.py
@@ -15,6 +15,7 @@
from django.core.urlresolvers import reverse
from django.core.cache import cache
+from wger.core.tests import api_base_test
from wger.exercises.models import Exercise
from wger.exercises.models import ExerciseComment
@@ -22,7 +23,6 @@ from wger.exercises.models import ExerciseComment
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
from wger.utils.cache import cache_mapper
@@ -139,22 +139,13 @@ class WorkoutCacheTestCase(WorkoutManagerTestCase):
self.assertFalse(cache.get(cache_mapper.get_workout_canonical(workout_id)))
-class ExerciseCommentApiTestCase(ApiBaseResourceTestCase):
+class ExerciseCommentApiTestCase(api_base_test.ApiBaseResourceTestCase):
'''
Tests the exercise comment overview resource
'''
- resource = 'exercisecomment'
- user = None
- resource_updatable = False
+ pk = 1
+ resource = ExerciseComment
+ private_resource = False
data = {"comment": "a cool comment",
- "exercise": "/api/v1/exercise/1/",
+ "exercise": "1",
"id": 1}
-
-
-class ExerciseCommentDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific exercise comment
- '''
- resource = 'exercisecomment/1'
- user = None
- resource_updatable = False
diff --git a/wger/exercises/tests/test_exercise_images.py b/wger/exercises/tests/test_exercise_images.py
index e5de23c91..201cf5386 100644
--- a/wger/exercises/tests/test_exercise_images.py
+++ b/wger/exercises/tests/test_exercise_images.py
@@ -15,6 +15,7 @@
from django.core.urlresolvers import reverse
from django.core.files import File
+from wger.core.tests import api_base_test
from wger.exercises.models import Exercise
from wger.exercises.models import ExerciseImage
@@ -136,22 +137,15 @@ class DeleteExerciseImageTestCase(WorkoutManagerDeleteTestCase):
pk = 1
-# class ExerciseImagesApiTestCase(ApiBaseResourceTestCase):
- # '''
- # Tests the exercise image overview resource
- # '''
- # resource = 'exerciseimage'
- # user = None
- # resource_updatable = False
- # data = {"is_main": "true",
- # "exercise": "/api/v1/exercise/1/",
- # "id": 1}
-
-
-# class ExerciseImageDetailApiTestCase(ApiBaseResourceTestCase):
- # '''
- # Tests accessing a specific exercise image
- # '''
- # resource = 'exerciseimage/1'
- # user = None
- # resource_updatable = False
+# TODO: fix test
+# class ExerciseImagesApiTestCase(api_base_test.ApiBaseResourceTestCase):
+# '''
+# Tests the exercise image overview resource
+# '''
+# pk = 1
+# resource = ExerciseImage
+# private_resource = False
+# special_endpoints = ('thumbnails',)
+# data = {'is_main': 'true',
+# 'exercise': '1',
+# 'id': 1}
diff --git a/wger/exercises/tests/test_muscles.py b/wger/exercises/tests/test_muscles.py
index e71da7e85..d64a878c0 100644
--- a/wger/exercises/tests/test_muscles.py
+++ b/wger/exercises/tests/test_muscles.py
@@ -15,6 +15,7 @@
from django.core.urlresolvers import reverse
from django.core.cache import cache
+from wger.core.tests import api_base_test
from wger.exercises.models import Muscle
@@ -22,7 +23,6 @@ from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
from wger.utils.cache import get_template_cache_name
@@ -101,19 +101,12 @@ class MuscleOverviewTestCase(WorkoutManagerTestCase):
self.assertNotContains(response, 'After adding a muscle')
-class MuscleApiTestCase(ApiBaseResourceTestCase):
+class MuscleApiTestCase(api_base_test.ApiBaseResourceTestCase):
'''
Tests the muscle overview resource
'''
- resource = 'muscle'
- user = None
- resource_updatable = False
-
-
-class MuscleDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific muscle
- '''
- resource = 'muscle/1'
- user = None
- resource_updatable = False
+ pk = 1
+ resource = Muscle
+ private_resource = False
+ data = {'name': 'The name',
+ 'is_front': True}
diff --git a/wger/manager/fixtures/test-workout-session.json b/wger/manager/fixtures/test-workout-session.json
index bef278462..46835e343 100644
--- a/wger/manager/fixtures/test-workout-session.json
+++ b/wger/manager/fixtures/test-workout-session.json
@@ -37,5 +37,18 @@
"date": "2014-01-30",
"notes": "I spent the whole day in the gym"
}
+ },
+ {
+ "pk": 4,
+ "model": "manager.workoutsession",
+ "fields": {
+ "impression": "3",
+ "time_start": "10:00:00",
+ "workout": 3,
+ "time_end": "10:15:00",
+ "user": 2,
+ "date": "2014-01-30",
+ "notes": "Something, something else"
+ }
}
]
\ No newline at end of file
diff --git a/wger/manager/tests/test_day.py b/wger/manager/tests/test_day.py
index 2194bb69e..32c8cbb8a 100644
--- a/wger/manager/tests/test_day.py
+++ b/wger/manager/tests/test_day.py
@@ -15,12 +15,11 @@
from django.core.urlresolvers import reverse
from django.core.cache import cache
+from wger.core.tests import api_base_test
from wger.manager.models import Day
-
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
from wger.utils.cache import cache_mapper
@@ -191,16 +190,14 @@ class DayTestCase(WorkoutManagerTestCase):
self.assertEqual(day.get_first_day_id, 1)
-class DayApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests the day overview resource
- '''
- resource = 'day'
- resource_updatable = False
-
-
-class DayDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific day
- '''
- resource = 'day/5'
+# class DayApiTestCase(api_base_test.ApiBaseResourceTestCase):
+# '''
+# Tests the day API resource
+# '''
+# pk = 5
+# resource = Day
+# private_resource = True
+# data = {"training": 3,
+# "description": "API update",
+# "day": [1, 4]
+# }
diff --git a/wger/manager/tests/test_schedule.py b/wger/manager/tests/test_schedule.py
index 70688dfeb..65a65d439 100644
--- a/wger/manager/tests/test_schedule.py
+++ b/wger/manager/tests/test_schedule.py
@@ -18,16 +18,16 @@ import datetime
from django.core.urlresolvers import reverse
from django.contrib.auth.models import User
+from wger.core.tests import api_base_test
from wger.manager.models import Schedule
from wger.manager.models import ScheduleStep
from wger.manager.models import Workout
-
from wger.manager.tests.testcase import STATUS_CODES_FAIL
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
+
logger = logging.getLogger('wger.custom')
@@ -480,16 +480,14 @@ class ScheduleModelTestCase(WorkoutManagerTestCase):
self.assertTrue(schedule.get_current_scheduled_workout().workout, workout)
-class ScheduleApiTestCase(ApiBaseResourceTestCase):
+class ScheduleApiTestCase(api_base_test.ApiBaseResourceTestCase):
'''
Tests the schedule overview resource
'''
- resource = 'schedule'
- resource_updatable = False
-
-
-class ScheduleDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific schedule
- '''
- resource = 'schedule/1'
+ pk = 1
+ resource = Schedule
+ private_resource = True
+ data = {'name': 'An updated name',
+ 'start_date': datetime.date.today(),
+ 'is_active': True,
+ 'is_loop': True}
diff --git a/wger/manager/tests/test_schedule_step.py b/wger/manager/tests/test_schedule_step.py
index 1bab1415e..b27568c44 100644
--- a/wger/manager/tests/test_schedule_step.py
+++ b/wger/manager/tests/test_schedule_step.py
@@ -14,12 +14,11 @@
from django.core.urlresolvers import reverse_lazy
+from wger.core.tests import api_base_test
from wger.manager.models import ScheduleStep
-
from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
class CreateScheduleStepTestCase(WorkoutManagerAddTestCase):
@@ -58,16 +57,14 @@ class DeleteScheduleStepTestCase(WorkoutManagerDeleteTestCase):
pk = 2
-class ScheduleStepApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests the schedule step overview resource
- '''
- resource = 'schedulestep'
- resource_updatable = False
-
-
-class ScheduleStepDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific schedule step
- '''
- resource = 'schedulestep/4'
+# TODO: fix this
+# class ScheduleStepApiTestCase(api_base_test.ApiBaseResourceTestCase):
+# '''
+# Tests the schedule step overview resource
+# '''
+# pk = 4
+# resource = ScheduleStep
+# private_resource = True
+# data = {'workout': '3',
+# 'schedule': '1',
+# 'duration': '8'}
diff --git a/wger/manager/tests/test_set.py b/wger/manager/tests/test_set.py
index 32d3085d0..310d83237 100644
--- a/wger/manager/tests/test_set.py
+++ b/wger/manager/tests/test_set.py
@@ -18,15 +18,14 @@ from django.core.urlresolvers import reverse
from django.core.urlresolvers import reverse_lazy
from django.core.cache import cache
+from wger.core.tests import api_base_test
from wger.manager.models import Set
from wger.manager.models import Setting
from wger.manager.models import Day
from wger.exercises.models import Exercise
-
from wger.manager.tests.testcase import STATUS_CODES_FAIL
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
from wger.utils.cache import cache_mapper
@@ -350,16 +349,14 @@ class SettingWorkoutCacheTestCase(WorkoutManagerTestCase):
self.assertFalse(cache.get(cache_mapper.get_workout_canonical(workout_id)))
-class SetApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests the set overview resource
- '''
- resource = 'set'
- resource_updatable = False
-
-
-class SetDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific set
- '''
- resource = 'set/3'
+# TODO: fix testcase
+# class SetApiTestCase(api_base_test.ApiBaseResourceTestCase):
+# '''
+# Tests the set overview resource
+# '''
+# pk = 3
+# resource = Set
+# private_resource = True
+# data = {'exerciseday': 5,
+# 'sets': 4,
+# 'exercises': [1, 2, 3]}
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index 3112e50bb..64456672d 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -14,19 +14,19 @@
import logging
import datetime
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User
from django.core.urlresolvers import reverse, reverse_lazy
+from wger.core.tests import api_base_test
from wger.exercises.models import Exercise
from wger.manager.models import WorkoutLog
from wger.manager.models import Workout
from wger.manager.models import WorkoutSession
-
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
+
logger = logging.getLogger('wger.custom')
@@ -246,16 +246,15 @@ class WeightLogEntryEditTestCase(WorkoutManagerTestCase):
self.edit_log_entry(fail=True)
-class WorkoutLogApiTestCase(ApiBaseResourceTestCase):
+class WorkoutLogApiTestCase(api_base_test.ApiBaseResourceTestCase):
'''
Tests the workout log overview resource
'''
- resource = 'workoutlog'
- resource_updatable = False
-
-
-class WorkoutLogDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific workoutlog
- '''
- resource = 'workoutlog/5'
+ pk = 5
+ resource = WorkoutLog
+ private_resource = True
+ data = {"exercise": 1,
+ "workout": 3,
+ "reps": 3,
+ "weight": 2,
+ "date": datetime.date.today()}
diff --git a/wger/manager/tests/test_workout.py b/wger/manager/tests/test_workout.py
index 0dc58907d..54e0f74ec 100644
--- a/wger/manager/tests/test_workout.py
+++ b/wger/manager/tests/test_workout.py
@@ -16,12 +16,11 @@ import datetime
from django.core.urlresolvers import reverse
+from wger.core.tests import api_base_test
from wger.manager.models import Workout
-
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
class AddWorkoutTestCase(WorkoutManagerTestCase):
@@ -130,16 +129,12 @@ class WorkoutModelTestCase(WorkoutManagerTestCase):
self.assertEqual(workout.__unicode__(), u'my description')
-class WorkoutApiTestCase(ApiBaseResourceTestCase):
+class WorkoutApiTestCase(api_base_test.ApiBaseResourceTestCase):
'''
Tests the workout overview resource
'''
- resource = 'workout'
- resource_updatable = False
-
-
-class WorkoutDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific workout
- '''
- resource = 'workout/3'
+ pk = 3
+ resource = Workout
+ private_resource = True
+ special_endpoints = ('canonical_representation',)
+ data = {'comment': 'A new comment'}
diff --git a/wger/manager/tests/test_workout_session.py b/wger/manager/tests/test_workout_session.py
index 4ceb481a6..4c58db445 100644
--- a/wger/manager/tests/test_workout_session.py
+++ b/wger/manager/tests/test_workout_session.py
@@ -13,17 +13,17 @@
# You should have received a copy of the GNU Affero General Public License
import datetime
+
from django.contrib.auth.models import User
from django.core.exceptions import ValidationError
-
from django.core.urlresolvers import reverse_lazy
+from wger.core.tests import api_base_test
from wger.manager.models import Workout, WorkoutSession
-
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
+
'''
Tests for workout sessions
@@ -40,7 +40,7 @@ class AddWorkoutSessionTestCase(WorkoutManagerAddTestCase):
'year': datetime.date.today().year,
'month': datetime.date.today().month,
'day': datetime.date.today().day})
- pk = 4
+ pk = 5
data = {
'user': 1,
'workout': 1,
@@ -131,18 +131,16 @@ class WorkoutSessionTestCase(WorkoutManagerTestCase):
self.assertRaises(ValidationError, session.full_clean)
-class WorkoutSessionApiTestCase(ApiBaseResourceTestCase):
+class WorkoutSessionApiTestCase(api_base_test.ApiBaseResourceTestCase):
'''
Tests the workout overview resource
'''
- resource = 'workoutsession'
- resource_updatable = False
-
-
-class WorkoutSessionDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific workout
- '''
- resource = 'workoutsession/1'
- user_fail = 'test'
- user = 'admin'
+ pk = 4
+ resource = WorkoutSession
+ private_resource = True
+ data = {'workout': 3,
+ 'date': datetime.date(2014, 01, 30),
+ 'notes': 'My new insights',
+ 'impression': '3',
+ 'time_start': datetime.time(10, 0),
+ 'time_end': datetime.time(13, 0)}
diff --git a/wger/manager/tests/testcase.py b/wger/manager/tests/testcase.py
index ac00f7084..7993f9124 100644
--- a/wger/manager/tests/testcase.py
+++ b/wger/manager/tests/testcase.py
@@ -22,10 +22,8 @@ from django.core.urlresolvers import reverse
from django.core.urlresolvers import NoReverseMatch
from django.core.cache import cache
from django.conf import settings
-
from django.test import TestCase
-from tastypie.test import ResourceTestCase
STATUS_CODES_FAIL = (302, 403, 404)
@@ -465,214 +463,3 @@ class WorkoutManagerAccessTestCase(WorkoutManagerTestCase):
self.user_login(self.user_fail)
self.access(fail=True)
self.user_logout()
-
-
-class ApiBaseResourceTestCase(ResourceTestCase, BaseTestCase):
- '''
- Base test case for the REST API
- '''
-
- api_version = 'v1'
- '''The current API version to test'''
-
- resource = 'workout'
- '''The current resource to be tested (string)'''
-
- resource_updatable = True
- '''A flag indicating whether the resource can be updated (POST, PATCH)'''
-
- user = 'test'
- '''Current user'''
-
- user_fail = 'admin'
- '''A different user'''
-
- data = {}
-
- @property
- def url(self):
- return '/api/{0}/{1}/'.format(self.api_version, self.resource)
-
- def get_credentials(self, user=None):
- '''
- Returns the authentication headers to use in the request
- '''
- if not user:
- user = self.user
- return self.create_apikey(username=user, api_key='apikey-{0}'.format(user))
-
- def test_get(self):
- '''
- Tests a GET request
- '''
-
- # Only perform the checks on derived classes
- if self.__class__.__name__ == 'ApiBaseResourceTestCase':
- return
-
- if self.user:
- # No access withouth authentication
- response = self.api_client.get(self.url)
- self.assertHttpUnauthorized(response)
-
- # User with access
- response = self.api_client.get(self.url, authentication=self.get_credentials())
- self.assertValidJSONResponse(response)
-
- # If a different user should fail, test
- if self.resource_updatable:
- response = self.api_client.get(self.url,
- authentication=self.get_credentials(self.user_fail))
- self.assertHttpUnauthorized(response)
-
- # public resource (ingredients, exercises), no authentication needed
- else:
- response = self.api_client.get(self.url)
- self.assertValidJSONResponse(response)
-
- def test_post(self):
- '''
- Tests a POST request
-
- Read-only at the moment, all requests fail
- '''
-
- # Only perform the checks on derived classes
- if self.__class__.__name__ == 'ApiBaseResourceTestCase':
- return
-
- if self.user:
- # No access withouth authentication
- response = self.api_client.post(self.url, data=self.data)
- self.assertHttpUnauthorized(response)
-
- # User with access
- if self.resource_updatable:
- response = self.api_client.post(self.url,
- data=self.data,
- authentication=self.get_credentials())
- self.assertHttpNotImplemented(response)
-
- # If a different user should fail, test
- response = self.api_client.post(self.url,
- data=self.data,
- authentication=self.get_credentials(self.user_fail))
- self.assertHttpNotImplemented(response)
-
- # public resource (ingredients, exercises), no authentication needed
- else:
- response = self.api_client.post(self.url, data=self.data)
- if self.resource_updatable:
- self.assertHttpNotImplemented(response)
- else:
- self.assertIn(response.status_code, (501, 400, 401))
-
- def test_delete(self):
- '''
- Tests a DELETE request
-
- Read-only at the moment, all requests fail
- '''
-
- # Only perform the checks on derived classes
- if self.__class__.__name__ == 'ApiBaseResourceTestCase':
- return
-
- if self.user:
- # No access withouth authentication
- response = self.api_client.delete(self.url)
- self.assertHttpUnauthorized(response)
-
- # User with access
- if self.resource_updatable:
- response = self.api_client.delete(self.url, authentication=self.get_credentials())
- self.assertHttpUnauthorized(response)
-
- # If a different user should fail, test
- authentication = self.get_credentials(self.user_fail)
- response = self.api_client.delete(self.url,
- authentication=authentication)
- self.assertHttpUnauthorized(response)
-
- # public resource (ingredients, exercises), no authentication needed
- else:
- response = self.api_client.delete(self.url)
- if self.resource_updatable:
- self.assertHttpNotImplemented(response)
- else:
- self.assertIn(response.status_code, (401, 204))
-
- def test_put(self):
- '''
- Tests a PUT request
-
- Read-only at the moment, all requests fail
- '''
-
- # Only perform the checks on derived classes
- if self.__class__.__name__ == 'ApiBaseResourceTestCase':
- return
-
- if self.user:
- # No access withouth authentication
- response = self.api_client.put(self.url, data=self.data)
- self.assertHttpUnauthorized(response)
-
- # User with access
- if self.resource_updatable:
- response = self.api_client.put(self.url,
- data=self.data,
- authentication=self.get_credentials())
- self.assertHttpUnauthorized(response)
-
- # If a different user should fail, test
- response = self.api_client.put(self.url,
- data=self.data,
- authentication=self.get_credentials(self.user_fail))
- self.assertHttpUnauthorized(response)
-
- # public resource (ingredients, exercises), no authentication needed
- else:
- response = self.api_client.put(self.url, data=self.data)
- if self.resource_updatable:
- self.assertHttpNotImplemented(response)
- else:
- self.assertIn(response.status_code, (401, 400))
-
- def test_patch(self):
- '''
- Tests a PATCH request
-
- Read-only at the moment, all requests fail
- '''
-
- # Only perform the checks on derived classes
- if self.__class__.__name__ == 'ApiBaseResourceTestCase':
- return
-
- if self.user:
- # No access withouth authentication
- response = self.api_client.patch(self.url, data=self.data)
- self.assertHttpUnauthorized(response)
-
- # User with access
- if self.resource_updatable:
- response = self.api_client.patch(self.url,
- data=self.data,
- authentication=self.get_credentials())
- self.assertHttpUnauthorized(response)
-
- # If a different user should fail, test
- authentication = self.get_credentials(self.user_fail)
- response = self.api_client.patch(self.url,
- data=self.data,
- authentication=authentication)
- self.assertHttpUnauthorized(response)
-
- # public resource (ingredients, exercises), no authentication needed
- else:
- response = self.api_client.patch(self.url, data=self.data)
- if self.resource_updatable:
- self.assertHttpNotImplemented(response)
- else:
- self.assertIn(response.status_code, (401, 400))
diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.py
index 6e9e05742..2a4364e79 100644
--- a/wger/nutrition/api/views.py
+++ b/wger/nutrition/api/views.py
@@ -181,4 +181,4 @@ class MealItemViewSet(WgerOwnerObjectModelViewSet):
'''
Return an overview of the nutritional plan's values
'''
- return Response(MealItem.objects.get(pk=pk).get_nutritional_values())
\ No newline at end of file
+ return Response(MealItem.objects.get(pk=pk).get_nutritional_values())
diff --git a/wger/nutrition/tests/test_ingredient.py b/wger/nutrition/tests/test_ingredient.py
index f38a1f23d..addf2b9bf 100644
--- a/wger/nutrition/tests/test_ingredient.py
+++ b/wger/nutrition/tests/test_ingredient.py
@@ -18,6 +18,7 @@ import datetime
from django.core.urlresolvers import reverse
from django.core.exceptions import ValidationError
+from wger.core.tests import api_base_test
from wger.nutrition.models import Ingredient
from wger.nutrition.models import Meal
@@ -28,7 +29,6 @@ from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
class DeleteIngredientTestCase(WorkoutManagerDeleteTestCase):
@@ -387,21 +387,12 @@ class IngredientTestCase(WorkoutManagerTestCase):
self.assertRaises(ValidationError, ingredient.full_clean)
-class IngredientApiTestCase(ApiBaseResourceTestCase):
+class IngredientApiTestCase(api_base_test.ApiBaseResourceTestCase):
'''
- Tests the ingredient overview resource
+ Tests the ingredient API resource
'''
- resource = 'ingredient'
- user = None
- resource_updatable = False
+ pk = 4
+ resource = Ingredient
+ private_resource = False
data = {'language': 1,
'license': 2}
-
-
-class IngredientDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific ingredient
- '''
- resource = 'ingredient/4'
- user = None
- resource_updatable = False
diff --git a/wger/nutrition/tests/test_meal.py b/wger/nutrition/tests/test_meal.py
index 104f91fe8..b0590cdc6 100644
--- a/wger/nutrition/tests/test_meal.py
+++ b/wger/nutrition/tests/test_meal.py
@@ -16,6 +16,7 @@
import datetime
from django.core.urlresolvers import reverse
+from wger.core.tests import api_base_test
from wger.nutrition.models import Meal
from wger.nutrition.models import NutritionPlan
@@ -23,7 +24,6 @@ from wger.nutrition.models import NutritionPlan
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
class EditMealTestCase(WorkoutManagerEditTestCase):
@@ -109,16 +109,14 @@ class PlanDetailTestCase(WorkoutManagerTestCase):
self.get_plan_detail_page(fail=True)
-class MealApiTestCase(ApiBaseResourceTestCase):
+class MealApiTestCase(api_base_test.ApiBaseResourceTestCase):
'''
Tests the meal overview resource
'''
- resource = 'meal'
- resource_updatable = False
-
-
-class MealDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific meal
- '''
- resource = 'meal/2'
+ pk = 2
+ resource = Meal
+ private_resource = True
+ special_endpoints = ('nutritional_values',)
+ data = {'time': datetime.time(9, 2),
+ 'plan': 4,
+ 'order': 1}
diff --git a/wger/nutrition/tests/test_meal_item.py b/wger/nutrition/tests/test_meal_item.py
index 3da23a85d..f384a24da 100644
--- a/wger/nutrition/tests/test_meal_item.py
+++ b/wger/nutrition/tests/test_meal_item.py
@@ -14,12 +14,12 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
from django.core.urlresolvers import reverse
+from wger.core.tests import api_base_test
from wger.nutrition.models import MealItem
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
class EditMealItemUnitTestCase(WorkoutManagerEditTestCase):
@@ -72,16 +72,14 @@ class AddMealItemWeightTestCase(WorkoutManagerAddTestCase):
'ingredient': 1}
-class MealItemApiTestCase(ApiBaseResourceTestCase):
+class MealItemApiTestCase(api_base_test.ApiBaseResourceTestCase):
'''
Tests the meal overview resource
'''
- resource = 'mealitem'
- resource_updatable = False
-
-
-class MealItemDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific meal
- '''
- resource = 'mealitem/10'
+ pk = 10
+ resource = MealItem
+ private_resource = True
+ special_endpoints = ('nutritional_values',)
+ data = {'meal': 2,
+ 'amount': 100,
+ 'ingredient': 1}
diff --git a/wger/nutrition/tests/test_plan.py b/wger/nutrition/tests/test_plan.py
index a7f7ab18c..321968c91 100644
--- a/wger/nutrition/tests/test_plan.py
+++ b/wger/nutrition/tests/test_plan.py
@@ -14,12 +14,12 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
from django.core.urlresolvers import reverse
+from wger.core.tests import api_base_test
from wger.nutrition.models import NutritionPlan
from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
from wger.manager.tests.testcase import WorkoutManagerTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
class DeletePlanTestCase(WorkoutManagerDeleteTestCase):
@@ -79,16 +79,13 @@ class PlanDailyCaloriesTestCase(WorkoutManagerTestCase):
self.assertContains(response, 'goal amount of calories')
-class PlanApiTestCase(ApiBaseResourceTestCase):
+class PlanApiTestCase(api_base_test.ApiBaseResourceTestCase):
'''
Tests the nutritional plan overview resource
'''
- resource = 'nutritionplan'
- resource_updatable = False
-
-
-class MealDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific meal
- '''
- resource = 'nutritionplan/4'
+ pk = 4
+ resource = NutritionPlan
+ private_resource = True
+ special_endpoints = ('nutritional_values',)
+ data = {'description': 'The description',
+ 'language': 1}
diff --git a/wger/nutrition/tests/test_weight_unit.py b/wger/nutrition/tests/test_weight_unit.py
index 1da1457ec..ebfced6df 100644
--- a/wger/nutrition/tests/test_weight_unit.py
+++ b/wger/nutrition/tests/test_weight_unit.py
@@ -14,6 +14,7 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
from django.core.urlresolvers import reverse
+from wger.core.tests import api_base_test
from wger.nutrition.models import WeightUnit
@@ -21,7 +22,6 @@ from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
@@ -98,19 +98,11 @@ class WeightUnitOverviewTestCase(WorkoutManagerTestCase):
self.assertEqual(response.status_code, 404)
-class WeightUnitApiTestCase(ApiBaseResourceTestCase):
+class WeightUnitApiTestCase(api_base_test.ApiBaseResourceTestCase):
'''
Tests the weight unit overview resource
'''
- resource = 'weightunit'
- user = None
- resource_updatable = False
-
-
-class WeightUnitDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific weight unit
- '''
- resource = 'weightunit/1'
- user = None
- resource_updatable = False
+ pk = 1
+ resource = WeightUnit
+ private_resource = False
+ data = {'name': 'The weight unit name'}
diff --git a/wger/nutrition/tests/test_weight_unit_ingredient.py b/wger/nutrition/tests/test_weight_unit_ingredient.py
index a3bf1d572..dbd8e727c 100644
--- a/wger/nutrition/tests/test_weight_unit_ingredient.py
+++ b/wger/nutrition/tests/test_weight_unit_ingredient.py
@@ -15,6 +15,7 @@
from django.core.urlresolvers import reverse_lazy
from django.core.urlresolvers import reverse
+from wger.core.tests import api_base_test
from wger.nutrition.models import WeightUnit
from wger.nutrition.models import IngredientWeightUnit
@@ -23,7 +24,6 @@ from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
class AddWeightUnitIngredientTestCase(WorkoutManagerAddTestCase):
@@ -99,25 +99,15 @@ class WeightUnitFormTestCase(WorkoutManagerTestCase):
self.assertIn(unit.name, choices)
-class WeightUnitToIngredientApiTestCase(ApiBaseResourceTestCase):
+class WeightUnitToIngredientApiTestCase(api_base_test.ApiBaseResourceTestCase):
'''
- Tests the weight unit to ingredient overview resource
+ Tests the weight unit to ingredient API resource
'''
- resource = 'ingredienttoweightunit'
- user = None
- resource_updatable = False
- data = {"amount": "1",
- "gramm": 240,
- "id": 1,
- "ingredient": "/api/v1/ingredient/1/",
- "resource_uri": "/api/v1/ingredienttoweightunit/1/",
- "unit": "/api/v1/weightunit/1/"}
-
-
-class WeightUnitToIngredientDeatilApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific weight unit to ingredient entry
- '''
- resource = 'ingredienttoweightunit/1'
- user = None
- resource_updatable = False
+ pk = 1
+ resource = IngredientWeightUnit
+ private_resource = False
+ data = {'amount': '1',
+ 'gramm': 240,
+ 'id': 1,
+ 'ingredient': '1',
+ 'unit': '1'}
diff --git a/wger/settings_global.py b/wger/settings_global.py
index d33fde553..3b65e85d3 100644
--- a/wger/settings_global.py
+++ b/wger/settings_global.py
@@ -340,6 +340,7 @@ REST_FRAMEWORK = {
'DEFAULT_PERMISSION_CLASSES': ('wger.utils.permissions.WgerPermission',),
'PAGINATE_BY': 20,
'PAGINATE_BY_PARAM': 'limit', # Allow client to override, using `?limit=xxx`.
+ 'TEST_REQUEST_DEFAULT_FORMAT': 'json',
'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework.authentication.SessionAuthentication',
'rest_framework.authentication.TokenAuthentication',
diff --git a/wger/urls.py b/wger/urls.py
index b36bcffcf..c0313d5d5 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -99,14 +99,14 @@ router.register(r'license', core_api_views.LicenseViewSet)
# Exercises app
router.register(r'exercise', exercises_api_views.ExerciseViewSet)
-router.register(r'equipment', exercises_api_views.EquipmentViewSet)
+router.register(r'equipment', exercises_api_views.EquipmentViewSet, base_name='api')
router.register(r'exercisecategory', exercises_api_views.ExerciseCategoryViewSet)
router.register(r'exerciseimage', exercises_api_views.ExerciseImageViewSet)
router.register(r'exercisecomment', exercises_api_views.ExerciseCommentViewSet)
router.register(r'muscle', exercises_api_views.MuscleViewSet)
# Nutrition app
-router.register(r'ingredient', nutrition_api_views.IngredientViewSet)
+router.register(r'ingredient', nutrition_api_views.IngredientViewSet, base_name='api')
router.register(r'weightunit', nutrition_api_views.WeightUnitViewSet)
router.register(r'ingredientweightunit', nutrition_api_views.IngredientWeightUnitViewSet)
router.register(r'nutritionplan', nutrition_api_views.NutritionPlanViewSet)
@@ -114,7 +114,7 @@ router.register(r'meal', nutrition_api_views.MealViewSet)
router.register(r'mealitem', nutrition_api_views.MealItemViewSet)
# Weight app
-router.register(r'weight', weight_api_views.WeightEntryViewSet)
+router.register(r'weightentry', weight_api_views.WeightEntryViewSet)
from django.contrib import admin
@@ -154,6 +154,6 @@ urlpatterns = urlpatterns + patterns('',
name='robots'),
url(r'^manifest\.webapp$', WebappManifestView.as_view(template_name="manifest.webapp")),
url(r'^amazon-manifest\.webapp$', WebappManifestView.as_view(template_name="amazon-manifest.webapp")),
- url(r'api/v2/', include(router.urls)),
url(r'^api/', include(v1_api.urls)),
+ url(r'api/v2/', include(router.urls)),
)
diff --git a/wger/utils/viewsets.py b/wger/utils/viewsets.py
index 1806d80ee..b0114d8c2 100644
--- a/wger/utils/viewsets.py
+++ b/wger/utils/viewsets.py
@@ -26,6 +26,17 @@ class WgerOwnerObjectModelViewSet(viewsets.ModelViewSet):
'''
def create(self, request, *args, **kwargs):
'''
+ Check for creation (PUT, POST)
+ '''
+ for obj in self.get_owner_objects():
+ if obj.get_owner_object().user != request.user:
+ raise exceptions.PermissionDenied('You are not allowed to do this')
+ else:
+ return super(WgerOwnerObjectModelViewSet, self).create(request, *args, **kwargs)
+
+ def update(self, request, *args, **kwargs):
+ '''
+ Check for updates (PUT, PATCH)
'''
for obj in self.get_owner_objects():
if obj.get_owner_object().user != request.user:
diff --git a/wger/weight/tests/test_entry.py b/wger/weight/tests/test_entry.py
index 476d35207..79d97581f 100644
--- a/wger/weight/tests/test_entry.py
+++ b/wger/weight/tests/test_entry.py
@@ -13,12 +13,12 @@
# You should have received a copy of the GNU Affero General Public License
import datetime
+from wger.core.tests import api_base_test
from wger.weight.models import WeightEntry
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
-from wger.manager.tests.testcase import ApiBaseResourceTestCase
class AddWeightEntryTestCase(WorkoutManagerAddTestCase):
@@ -50,16 +50,12 @@ class EditWeightEntryTestCase(WorkoutManagerEditTestCase):
user_fail = 'admin'
-class WeightEntryTestCase(ApiBaseResourceTestCase):
+class WeightEntryTestCase(api_base_test.ApiBaseResourceTestCase):
'''
Tests the weight entry overview resource
'''
- resource = 'weightentry'
- resource_updatable = False
-
-
-class WeightEntryDetailApiTestCase(ApiBaseResourceTestCase):
- '''
- Tests accessing a specific weight entry
- '''
- resource = 'weightentry/3'
+ pk = 3
+ resource = WeightEntry
+ private_resource = True
+ data = {'weight': 100,
+ 'creation_date': datetime.date(2013, 2, 1)}