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

Update comments app

Browse Source 
Add transaction handling. Add comment view link. Update views to
user ExternalObjectMixin. Add event tests.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2019-05-09 20:22:12 -04:00
parent fffcf4d3da
commit cbd51c5f26
10 changed files with 216 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mayan/apps/document_comments/tests/mixins.py Normal file
View File

@@ -0,0 +1,26 @@
from __future__ import unicode_literals
from .literals import TEST_COMMENT_TEXT
class DocumentCommentTestMixin(object):
def _create_test_comment(self):
self.test_document_comment = self.test_document.comments.create(
comment=TEST_COMMENT_TEXT, user=self._test_case_user
)
class DocumentCommentViewTestMixin(object):
def _request_test_comment_create_view(self):
return self.post(
viewname='comments:comment_add', kwargs={
'pk': self.test_document.pk
}, data={'comment': TEST_COMMENT_TEXT}
)
def _request_test_comment_delete_view(self):
return self.post(
viewname='comments:comment_delete', kwargs={
'pk': self.test_document_comment.pk
},
)

46
mayan/apps/document_comments/tests/test_api.py
View File

@@ -7,19 +7,17 @@ from mayan.apps.rest_api.tests import BaseAPITestCase
from ..models import Comment
from ..permissions import (
permission_comment_create, permission_comment_delete,
permission_comment_view
permission_document_comment_create, permission_document_comment_delete,
permission_document_comment_view
)
from .literals import TEST_COMMENT_TEXT
from .mixins import DocumentCommentTestMixin
class CommentAPITestCase(DocumentTestMixin, BaseAPITestCase):
def _create_test_comment(self):
return self.test_document.comments.create(
comment=TEST_COMMENT_TEXT, user=self._test_case_user
)
class CommentAPITestCase(
DocumentCommentTestMixin, DocumentTestMixin, BaseAPITestCase
):
def _request_comment_create_view(self):
return self.post(
viewname='rest_api:comment-list', kwargs={
@@ -37,7 +35,7 @@ class CommentAPITestCase(DocumentTestMixin, BaseAPITestCase):
def test_comment_create_view_with_access(self):
self.grant_access(
obj=self.test_document, permission=permission_comment_create
obj=self.test_document, permission=permission_document_comment_create
)
response = self._request_comment_create_view()
@@ -51,53 +49,53 @@ class CommentAPITestCase(DocumentTestMixin, BaseAPITestCase):
return self.delete(
viewname='rest_api:comment-detail', kwargs={
'document_pk': self.test_document.pk,
'comment_pk': self.test_comment.pk,
'comment_pk': self.test_document_comment.pk,
}
)
def test_comment_delete_view_no_access(self):
self.test_comment = self._create_test_comment()
self._create_test_comment()
response = self._request_comment_delete_view()
self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
self.assertTrue(self.test_comment in Comment.objects.all())
self.assertTrue(self.test_document_comment in Comment.objects.all())
def test_comment_delete_view_with_access(self):
self.test_comment = self._create_test_comment()
self._create_test_comment()
self.grant_access(
obj=self.test_document, permission=permission_comment_delete
obj=self.test_document, permission=permission_document_comment_delete
)
response = self._request_comment_delete_view()
self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
self.assertFalse(self.test_comment in Comment.objects.all())
self.assertFalse(self.test_document_comment in Comment.objects.all())
def _request_comment_view(self):
return self.get(
viewname='rest_api:comment-detail', kwargs={
'document_pk': self.test_document.pk,
'comment_pk': self.test_comment.pk
'comment_pk': self.test_document_comment.pk
}
)
def test_comment_detail_view_no_access(self):
self.test_comment = self._create_test_comment()
self._create_test_comment()
response = self._request_comment_view()
self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
def test_comment_detail_view_with_access(self):
self.test_comment = self._create_test_comment()
self._create_test_comment()
self.grant_access(
obj=self.test_document, permission=permission_comment_view
obj=self.test_document, permission=permission_document_comment_view
)
response = self._request_comment_view()
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['comment'], self.test_comment.comment)
self.assertEqual(response.data['comment'], self.test_document_comment.comment)
def _request_comment_list_view(self):
return self.get(
@@ -107,19 +105,19 @@ class CommentAPITestCase(DocumentTestMixin, BaseAPITestCase):
)
def test_comment_list_view_no_access(self):
self.test_comment = self._create_test_comment()
self._create_test_comment()
response = self._request_comment_list_view()
self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
def test_comment_list_view_with_access(self):
self.test_comment = self._create_test_comment()
self._create_test_comment()
self.grant_access(
obj=self.test_document, permission=permission_comment_view
obj=self.test_document, permission=permission_document_comment_view
)
response = self._request_comment_list_view()
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(
response.data['results'][0]['comment'], self.test_comment.comment
response.data['results'][0]['comment'], self.test_document_comment.comment
)

79
mayan/apps/document_comments/tests/test_events.py Normal file
View File

@@ -0,0 +1,79 @@
from __future__ import unicode_literals
from actstream.models import Action
from mayan.apps.documents.tests import GenericDocumentViewTestCase
from ..events import (
event_document_comment_created, event_document_comment_deleted
)
from ..models import Comment
from ..permissions import (
permission_document_comment_create, permission_document_comment_delete
)
from .mixins import DocumentCommentTestMixin, DocumentCommentViewTestMixin
class CommentEventsTestCase(
DocumentCommentTestMixin, DocumentCommentViewTestMixin,
GenericDocumentViewTestCase
):
def test_comment_create_event_no_permissions(self):
action_count = Action.objects.count()
response = self._request_test_comment_create_view()
self.assertEqual(response.status_code, 404)
self.assertEqual(Action.objects.count(), action_count)
def test_comment_create_event_with_permissions(self):
self.grant_permission(permission=permission_document_comment_create)
action_count = Action.objects.count()
response = self._request_test_comment_create_view()
self.assertEqual(response.status_code, 302)
self.assertEqual(Action.objects.count(), action_count + 1)
event = Action.objects.first()
comment = Comment.objects.first()
self.assertEqual(event.action_object, comment)
self.assertEqual(event.actor, self._test_case_user)
self.assertEqual(event.target, self.test_document)
self.assertEqual(event.verb, event_document_comment_created.id)
def test_comment_delete_event_no_permissions(self):
self._create_test_comment()
action_count = Action.objects.count()
response = self._request_test_comment_delete_view()
self.assertEqual(response.status_code, 404)
self.assertEqual(Action.objects.count(), action_count)
def test_comment_delete_event_with_access(self):
self._create_test_comment()
self.grant_access(
obj=self.test_document,
permission=permission_document_comment_delete
)
action_count = Action.objects.count()
response = self._request_test_comment_delete_view()
self.assertEqual(response.status_code, 302)
# Total count remains the same. Document comment created is removed due
# to cascade delete, document comment deleted event is added.
self.assertEqual(Action.objects.count(), action_count)
event = Action.objects.first()
self.assertEqual(event.actor, self._test_case_user)
self.assertEqual(event.target, self.test_document)
self.assertEqual(event.verb, event_document_comment_deleted.id)