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

Add support for editing document comments

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2019-05-09 22:29:07 -04:00
parent cbd51c5f26
commit f73179a600
17 changed files with 348 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mayan/apps/document_comments/tests/literals.py
View File

@@ -1,3 +1,4 @@
from __future__ import unicode_literals
TEST_COMMENT_TEXT = 'test comment text'
TEST_COMMENT_TEXT_EDITED = 'test comment text edited'

18
mayan/apps/document_comments/tests/mixins.py
View File

@@ -1,6 +1,6 @@
from __future__ import unicode_literals
from .literals import TEST_COMMENT_TEXT
from .literals import TEST_COMMENT_TEXT, TEST_COMMENT_TEXT_EDITED
class DocumentCommentTestMixin(object):
@@ -24,3 +24,19 @@ class DocumentCommentViewTestMixin(object):
'pk': self.test_document_comment.pk
},
)
def _request_test_comment_edit_view(self):
return self.post(
viewname='comments:comment_edit', kwargs={
'pk': self.test_document_comment.pk,
}, data={
'comment': TEST_COMMENT_TEXT_EDITED
}
)
def _request_test_comment_list_view(self):
return self.get(
viewname='comments:comments_for_document', kwargs={
'pk': self.test_document.pk,
}
)

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

@@ -8,17 +8,17 @@ from mayan.apps.rest_api.tests import BaseAPITestCase
from ..models import Comment
from ..permissions import (
permission_document_comment_create, permission_document_comment_delete,
permission_document_comment_view
permission_document_comment_edit, permission_document_comment_view
)
from .literals import TEST_COMMENT_TEXT
from .literals import TEST_COMMENT_TEXT, TEST_COMMENT_TEXT_EDITED
from .mixins import DocumentCommentTestMixin
class CommentAPITestCase(
DocumentCommentTestMixin, DocumentTestMixin, BaseAPITestCase
):
def _request_comment_create_view(self):
def _request_test_comment_create_api_view(self):
return self.post(
viewname='rest_api:comment-list', kwargs={
'document_pk': self.test_document.pk
@@ -28,7 +28,7 @@ class CommentAPITestCase(
)
def test_comment_create_view_no_access(self):
response = self._request_comment_create_view()
response = self._request_test_comment_create_api_view()
self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
self.assertEqual(Comment.objects.count(), 0)
@@ -38,14 +38,14 @@ class CommentAPITestCase(
obj=self.test_document, permission=permission_document_comment_create
)
response = self._request_comment_create_view()
response = self._request_test_comment_create_api_view()
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
comment = Comment.objects.first()
self.assertEqual(Comment.objects.count(), 1)
self.assertEqual(response.data['id'], comment.pk)
def _request_comment_delete_view(self):
def _request_test_comment_delete_api_view(self):
return self.delete(
viewname='rest_api:comment-detail', kwargs={
'document_pk': self.test_document.pk,
@@ -56,7 +56,7 @@ class CommentAPITestCase(
def test_comment_delete_view_no_access(self):
self._create_test_comment()
response = self._request_comment_delete_view()
response = self._request_test_comment_delete_api_view()
self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
self.assertTrue(self.test_document_comment in Comment.objects.all())
@@ -67,12 +67,43 @@ class CommentAPITestCase(
obj=self.test_document, permission=permission_document_comment_delete
)
response = self._request_comment_delete_view()
response = self._request_test_comment_delete_api_view()
self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
self.assertFalse(self.test_document_comment in Comment.objects.all())
def _request_comment_view(self):
def _request_comment_edit_patch_api_view(self):
return self.patch(
viewname='rest_api:comment-detail', kwargs={
'document_pk': self.test_document.pk,
'comment_pk': self.test_document_comment.pk,
}, data={'comment': TEST_COMMENT_TEXT_EDITED}
)
def test_comment_edit_view_no_access(self):
self._create_test_comment()
comment_text = self.test_document_comment.comment
response = self._request_comment_edit_patch_api_view()
self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
self.test_document_comment.refresh_from_db()
self.assertEqual(self.test_document_comment.comment, comment_text)
def test_comment_edit_view_with_access(self):
self._create_test_comment()
self.grant_access(
obj=self.test_document, permission=permission_document_comment_edit
)
comment_text = self.test_document_comment.comment
response = self._request_comment_edit_patch_api_view()
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.test_document_comment.refresh_from_db()
self.assertNotEqual(self.test_document_comment.comment, comment_text)
def _request_test_comment_api_view(self):
return self.get(
viewname='rest_api:comment-detail', kwargs={
'document_pk': self.test_document.pk,
@@ -83,7 +114,7 @@ class CommentAPITestCase(
def test_comment_detail_view_no_access(self):
self._create_test_comment()
response = self._request_comment_view()
response = self._request_test_comment_api_view()
self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
def test_comment_detail_view_with_access(self):
@@ -92,12 +123,12 @@ class CommentAPITestCase(
obj=self.test_document, permission=permission_document_comment_view
)
response = self._request_comment_view()
response = self._request_test_comment_api_view()
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['comment'], self.test_document_comment.comment)
def _request_comment_list_view(self):
def _request_test_comment_list_api_view(self):
return self.get(
viewname='rest_api:comment-list', kwargs={
'document_pk': self.test_document.pk
@@ -107,7 +138,7 @@ class CommentAPITestCase(
def test_comment_list_view_no_access(self):
self._create_test_comment()
response = self._request_comment_list_view()
response = self._request_test_comment_list_api_view()
self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
def test_comment_list_view_with_access(self):
@@ -116,7 +147,7 @@ class CommentAPITestCase(
obj=self.test_document, permission=permission_document_comment_view
)
response = self._request_comment_list_view()
response = self._request_test_comment_list_api_view()
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(
response.data['results'][0]['comment'], self.test_document_comment.comment

41
mayan/apps/document_comments/tests/test_events.py
View File

@@ -5,11 +5,13 @@ from actstream.models import Action
from mayan.apps.documents.tests import GenericDocumentViewTestCase
from ..events import (
event_document_comment_created, event_document_comment_deleted
event_document_comment_created, event_document_comment_deleted,
event_document_comment_edited
)
from ..models import Comment
from ..permissions import (
permission_document_comment_create, permission_document_comment_delete
permission_document_comment_create, permission_document_comment_delete,
permission_document_comment_edit
)
from .mixins import DocumentCommentTestMixin, DocumentCommentViewTestMixin
@@ -41,9 +43,9 @@ class CommentEventsTestCase(
comment = Comment.objects.first()
self.assertEqual(event.action_object, comment)
self.assertEqual(event.action_object, self.test_document)
self.assertEqual(event.actor, self._test_case_user)
self.assertEqual(event.target, self.test_document)
self.assertEqual(event.target, comment)
self.assertEqual(event.verb, event_document_comment_created.id)
def test_comment_delete_event_no_permissions(self):
@@ -77,3 +79,34 @@ class CommentEventsTestCase(
self.assertEqual(event.actor, self._test_case_user)
self.assertEqual(event.target, self.test_document)
self.assertEqual(event.verb, event_document_comment_deleted.id)
def test_comment_edit_event_no_permissions(self):
self._create_test_comment()
action_count = Action.objects.count()
response = self._request_test_comment_edit_view()
self.assertEqual(response.status_code, 404)
self.assertEqual(Action.objects.count(), action_count)
def test_comment_edit_event_with_access(self):
self._create_test_comment()
self.grant_access(
obj=self.test_document,
permission=permission_document_comment_edit
)
action_count = Action.objects.count()
response = self._request_test_comment_edit_view()
self.assertEqual(response.status_code, 302)
self.assertEqual(Action.objects.count(), action_count + 1)
event = Action.objects.first()
self.assertEqual(event.action_object, self.test_document)
self.assertEqual(event.actor, self._test_case_user)
self.assertEqual(event.target, self.test_document_comment)
self.assertEqual(event.verb, event_document_comment_edited.id)

110
mayan/apps/document_comments/tests/test_views.py Normal file
View File

@@ -0,0 +1,110 @@
from __future__ import unicode_literals
from mayan.apps.documents.tests import GenericDocumentViewTestCase
from ..models import Comment
from ..permissions import (
permission_document_comment_create, permission_document_comment_delete,
permission_document_comment_edit, permission_document_comment_view
)
from .mixins import DocumentCommentTestMixin, DocumentCommentViewTestMixin
class DocumentCommentViewTestCase(
DocumentCommentViewTestMixin, DocumentCommentTestMixin,
GenericDocumentViewTestCase
):
def test_comment_create_view_no_permissions(self):
comment_count = Comment.objects.count()
response = self._request_test_comment_create_view()
self.assertEqual(response.status_code, 404)
self.assertEqual(comment_count, Comment.objects.count())
def test_comment_create_view_with_permissions(self):
comment_count = Comment.objects.count()
self.grant_access(
obj=self.test_document,
permission=permission_document_comment_create
)
response = self._request_test_comment_create_view()
self.assertEqual(response.status_code, 302)
self.assertEqual(comment_count + 1, Comment.objects.count())
def test_comment_delete_view_no_permissions(self):
self._create_test_comment()
comment_count = Comment.objects.count()
response = self._request_test_comment_delete_view()
self.assertEqual(response.status_code, 404)
self.assertEqual(Comment.objects.count(), comment_count)
def test_comment_delete_view_with_access(self):
self._create_test_comment()
self.grant_access(
obj=self.test_document,
permission=permission_document_comment_delete
)
comment_count = Comment.objects.count()
response = self._request_test_comment_delete_view()
self.assertEqual(response.status_code, 302)
self.assertEqual(Comment.objects.count(), comment_count - 1)
def test_comment_edit_view_no_permissions(self):
self._create_test_comment()
comment_text = self.test_document_comment.comment
response = self._request_test_comment_edit_view()
self.assertEqual(response.status_code, 404)
self.test_document_comment.refresh_from_db()
self.assertEqual(self.test_document_comment.comment, comment_text)
def test_comment_edit_view_with_access(self):
self._create_test_comment()
self.grant_access(
obj=self.test_document, permission=permission_document_comment_edit
)
comment_text = self.test_document_comment.comment
response = self._request_test_comment_edit_view()
self.assertEqual(response.status_code, 302)
self.test_document_comment.refresh_from_db()
self.assertNotEqual(self.test_document_comment.comment, comment_text)
def test_comment_list_view_with_no_permission(self):
self._create_test_comment()
response = self._request_test_comment_list_view()
self.assertNotContains(
response=response, text=self.test_document_comment.comment,
status_code=404
)
def test_comment_list_view_with_access(self):
self._create_test_comment()
self.grant_access(
obj=self.test_document,
permission=permission_document_comment_view
)
response = self._request_test_comment_list_view()
self.assertContains(
response=response, text=self.test_document_comment.comment,
status_code=200
)