matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move add_to_class functions to their own module

Browse Source 
* The new module is called methods.py and found on each app.
* Add keyword arguments to add_to_class instances.
* Remove catch all exception handling for the check in and
  check out views.
* Improve checkouts tests code reducing redundant code.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2019-04-11 18:00:41 -04:00
parent a12c90268f
commit 456c322c19
33 changed files with 375 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
mayan/apps/checkouts/tests/test_api.py
View File

@@ -1,10 +1,7 @@
from __future__ import unicode_literals
import datetime
from django.test import override_settings
from django.utils.encoding import force_text
from django.utils.timezone import now
from rest_framework import status
@@ -14,12 +11,14 @@ from mayan.apps.rest_api.tests import BaseAPITestCase
from ..models import DocumentCheckout
from ..permissions import (
permission_document_checkout, permission_document_checkout_detail_view
permission_document_check_out, permission_document_check_out_detail_view
)
from .mixins import DocumentCheckoutTestMixin
@override_settings(OCR_AUTO_OCR=False)
class CheckoutsAPITestCase(DocumentTestMixin, BaseAPITestCase):
class CheckoutsAPITestCase(DocumentCheckoutTestMixin, DocumentTestMixin, BaseAPITestCase):
def setUp(self):
super(CheckoutsAPITestCase, self).setUp()
self.login_user()
@@ -27,32 +26,24 @@ class CheckoutsAPITestCase(DocumentTestMixin, BaseAPITestCase):
def _request_checkedout_document_view(self):
return self.get(
viewname='rest_api:checkedout-document-view',
args=(self.checkout.pk,)
)
def _checkout_document(self):
expiration_datetime = now() + datetime.timedelta(days=1)
self.checkout = DocumentCheckout.objects.checkout_document(
document=self.document, expiration_datetime=expiration_datetime,
user=self.admin_user, block_new_version=True
args=(self.test_check_out.pk,)
)
def test_checkedout_document_view_no_access(self):
self._checkout_document()
self._check_out_document()
response = self._request_checkedout_document_view()
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
def test_checkedout_document_view_with_checkout_access(self):
self._checkout_document()
self._check_out_document()
self.grant_access(
permission=permission_document_checkout_detail_view, obj=self.document
permission=permission_document_check_out_detail_view, obj=self.document
)
response = self._request_checkedout_document_view()
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
def test_checkedout_document_view_with_document_access(self):
self._checkout_document()
self._check_out_document()
self.grant_access(
permission=permission_document_view, obj=self.document
)
@@ -60,12 +51,12 @@ class CheckoutsAPITestCase(DocumentTestMixin, BaseAPITestCase):
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
def test_checkedout_document_view_with_access(self):
self._checkout_document()
self._check_out_document()
self.grant_access(
permission=permission_document_view, obj=self.document
)
self.grant_access(
permission=permission_document_checkout_detail_view, obj=self.document
permission=permission_document_check_out_detail_view, obj=self.document
)
response = self._request_checkedout_document_view()
self.assertEqual(response.status_code, status.HTTP_200_OK)
@@ -85,7 +76,7 @@ class CheckoutsAPITestCase(DocumentTestMixin, BaseAPITestCase):
self.assertEqual(DocumentCheckout.objects.count(), 0)
def test_document_checkout_with_access(self):
self.grant_access(permission=permission_document_checkout, obj=self.document)
self.grant_access(permission=permission_document_check_out, obj=self.document)
response = self._request_document_checkout_view()
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
self.assertEqual(
@@ -96,13 +87,13 @@ class CheckoutsAPITestCase(DocumentTestMixin, BaseAPITestCase):
return self.get(viewname='rest_api:checkout-document-list')
def test_checkout_list_view_no_access(self):
self._checkout_document()
self._check_out_document()
response = self._request_checkout_list_view()
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertNotContains(response=response, text=self.document.uuid)
def test_checkout_list_view_with_document_access(self):
self._checkout_document()
self._check_out_document()
self.grant_access(
permission=permission_document_view, obj=self.document
)
@@ -111,21 +102,21 @@ class CheckoutsAPITestCase(DocumentTestMixin, BaseAPITestCase):
self.assertNotContains(response=response, text=self.document.uuid)
def test_checkout_list_view_with_checkout_access(self):
self._checkout_document()
self._check_out_document()
self.grant_access(
permission=permission_document_checkout_detail_view, obj=self.document
permission=permission_document_check_out_detail_view, obj=self.document
)
response = self._request_checkout_list_view()
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertNotContains(response=response, text=self.document.uuid)
def test_checkout_list_view_with_access(self):
self._checkout_document()
self._check_out_document()
self.grant_access(
permission=permission_document_view, obj=self.document
)
self.grant_access(
permission=permission_document_checkout_detail_view, obj=self.document
permission=permission_document_check_out_detail_view, obj=self.document
)
response = self._request_checkout_list_view()
self.assertEqual(response.status_code, status.HTTP_200_OK)