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

Code style improvement. Test code consolidation. PEP8 cleanups.

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2018-10-06 02:13:36 -04:00
parent 025fafabf4
commit a99b044555
50 changed files with 656 additions and 682 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mayan/apps/documents/tests/test_api.py
+3 -3
View File
@@ -155,7 +155,7 @@ class DocumentAPITestCase(DocumentTestMixin, BaseAPITestCase):
self.login_user()
def _request_document_upload(self):
with open(TEST_DOCUMENT_PATH, 'rb') as file_descriptor:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_descriptor:
return self.post(
viewname='rest_api:document-list', data={
'document_type': self.document_type.pk,
@@ -208,7 +208,7 @@ class DocumentAPITestCase(DocumentTestMixin, BaseAPITestCase):
# is the latest.
time.sleep(1)
with open(TEST_DOCUMENT_PATH, 'rb') as file_descriptor:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_descriptor:
return self.post(
viewname='rest_api:document-version-list', args=(
self.document.pk,
@@ -245,7 +245,7 @@ class DocumentAPITestCase(DocumentTestMixin, BaseAPITestCase):
# Needed by MySQL as milliseconds value is not store in timestamp field
time.sleep(1)
with open(TEST_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_DOCUMENT_PATH, mode='rb') as file_object:
self.document.new_version(file_object=file_object)
def _request_document_version_revert(self):
mayan/apps/documents/tests/test_deleted_document_views.py
+31 -24
View File
@@ -16,13 +16,16 @@ class DeletedDocumentTestCase(GenericDocumentViewTestCase):
super(DeletedDocumentTestCase, self).setUp()
self.login_user()
def _request_document_restore_view(self):
return self.post(
viewname='documents:document_restore', args=(self.document.pk,)
)
def test_document_restore_view_no_permission(self):
self.document.delete()
self.assertEqual(Document.objects.count(), 0)
response = self.post(
'documents:document_restore', args=(self.document.pk,)
)
response = self._request_document_restore_view()
self.assertEqual(response.status_code, 403)
self.assertEqual(DeletedDocument.objects.count(), 1)
self.assertEqual(Document.objects.count(), 0)
@@ -34,18 +37,18 @@ class DeletedDocumentTestCase(GenericDocumentViewTestCase):
self.grant_access(
obj=self.document, permission=permission_document_restore
)
response = self.post(
'documents:document_restore', args=(self.document.pk,),
)
response = self._request_document_restore_view()
self.assertEqual(response.status_code, 302)
self.assertEqual(DeletedDocument.objects.count(), 0)
self.assertEqual(Document.objects.count(), 1)
def test_document_trash_no_permissions(self):
response = self.post(
'documents:document_trash', args=(self.document.pk,)
def _request_document_trash_view(self):
return self.post(
viewname='documents:document_trash', args=(self.document.pk,)
)
def test_document_trash_no_permissions(self):
response = self._request_document_trash_view()
self.assertEqual(response.status_code, 403)
self.assertEqual(DeletedDocument.objects.count(), 0)
self.assertEqual(Document.objects.count(), 1)
@@ -55,22 +58,22 @@ class DeletedDocumentTestCase(GenericDocumentViewTestCase):
obj=self.document, permission=permission_document_trash
)
response = self.post(
'documents:document_trash', args=(self.document.pk,),
)
response = self._request_document_trash_view()
self.assertEqual(response.status_code, 302)
self.assertEqual(DeletedDocument.objects.count(), 1)
self.assertEqual(Document.objects.count(), 0)
def _request_document_delete_view(self):
return self.post(
viewname='documents:document_delete', args=(self.document.pk,),
)
def test_document_delete_no_permissions(self):
self.document.delete()
self.assertEqual(Document.objects.count(), 0)
self.assertEqual(DeletedDocument.objects.count(), 1)
response = self.post(
'documents:document_delete', args=(self.document.pk,),
)
response = self._request_document_delete_view()
self.assertEqual(response.status_code, 403)
self.assertEqual(Document.objects.count(), 0)
self.assertEqual(DeletedDocument.objects.count(), 1)
@@ -84,19 +87,21 @@ class DeletedDocumentTestCase(GenericDocumentViewTestCase):
obj=self.document, permission=permission_document_delete
)
response = self.post(
'documents:document_delete', args=(self.document.pk,),
)
response = self._request_document_delete_view()
self.assertEqual(response.status_code, 302)
self.assertEqual(DeletedDocument.objects.count(), 0)
self.assertEqual(Document.objects.count(), 0)
def _request_document_list_deleted_view(self):
return self.get(viewname='documents:document_list_deleted')
def test_deleted_document_list_view_no_permissions(self):
self.document.delete()
response = self.get('documents:document_list_deleted')
self.assertNotContains(response, self.document.label, status_code=200)
response = self._request_document_list_deleted_view()
self.assertNotContains(
response=response, text=self.document.label, status_code=200
)
def test_deleted_document_list_view_with_access(self):
self.document.delete()
@@ -104,6 +109,8 @@ class DeletedDocumentTestCase(GenericDocumentViewTestCase):
self.grant_access(
obj=self.document, permission=permission_document_view
)
response = self.get('documents:document_list_deleted')
response = self._request_document_list_deleted_view()
self.assertContains(response, self.document.label, status_code=200)
self.assertContains(
response=response, text=self.document.label, status_code=200
)
mayan/apps/documents/tests/test_document_page_views.py
+2 -2
View File
@@ -14,7 +14,7 @@ class DocumentPageViewTestCase(GenericDocumentViewTestCase):
def _document_page_list_view(self):
return self.get(
'documents:document_pages', args=(self.document.pk,)
viewname='documents:document_pages', args=(self.document.pk,)
)
def test_document_page_list_view_no_permission(self):
@@ -27,5 +27,5 @@ class DocumentPageViewTestCase(GenericDocumentViewTestCase):
)
response = self._document_page_list_view()
self.assertContains(
response, text=self.document.label, status_code=200
response=response, text=self.document.label, status_code=200
)
mayan/apps/documents/tests/test_document_version_views.py
+24 -29
View File
@@ -17,64 +17,59 @@ class DocumentVersionTestCase(GenericDocumentViewTestCase):
super(DocumentVersionTestCase, self).setUp()
self.login_user()
def test_document_version_list_no_permission(self):
with open(TEST_SMALL_DOCUMENT_PATH, 'rb') as file_object:
def _upload_new_version(self):
with open(TEST_SMALL_DOCUMENT_PATH, mode='rb') as file_object:
self.document.new_version(
comment=TEST_VERSION_COMMENT, file_object=file_object
)
response = self.get(
'documents:document_version_list', args=(self.document.pk,)
def _request_document_version_list_view(self):
return self.get(
viewname='documents:document_version_list',
args=(self.document.pk,)
)
def test_document_version_list_no_permission(self):
self._upload_new_version()
response = self._request_document_version_list_view()
self.assertEqual(response.status_code, 403)
def test_document_version_list_with_access(self):
self._upload_new_version()
self.grant_access(
obj=self.document, permission=permission_document_version_view
)
with open(TEST_SMALL_DOCUMENT_PATH, 'rb') as file_object:
self.document.new_version(
comment=TEST_VERSION_COMMENT, file_object=file_object
)
response = self.get(
'documents:document_version_list', args=(self.document.pk,)
response = self._request_document_version_list_view()
self.assertContains(
response=response, text=TEST_VERSION_COMMENT, status_code=200
)
self.assertContains(response, TEST_VERSION_COMMENT, status_code=200)
def _request_document_version_revert_view(self, document_version):
return self.post(
viewname='documents:document_version_revert',
args=(document_version.pk,)
)
def test_document_version_revert_no_permission(self):
first_version = self.document.latest_version
self._upload_new_version()
with open(TEST_SMALL_DOCUMENT_PATH, 'rb') as file_object:
self.document.new_version(
file_object=file_object
)
response = self.post(
'documents:document_version_revert', args=(first_version.pk,)
response = self._request_document_version_revert_view(
document_version=first_version
)
self.assertEqual(response.status_code, 403)
self.assertEqual(self.document.versions.count(), 2)
def test_document_version_revert_with_access(self):
first_version = self.document.latest_version
with open(TEST_SMALL_DOCUMENT_PATH, 'rb') as file_object:
self.document.new_version(
file_object=file_object
)
self._upload_new_version()
self.grant_access(
obj=self.document, permission=permission_document_version_revert
)
response = self.post(
'documents:document_version_revert', args=(first_version.pk,),
response = self._request_document_version_revert_view(
document_version=first_version
)
self.assertEqual(response.status_code, 302)
self.assertEqual(self.document.versions.count(), 1)
mayan/apps/documents/tests/test_document_views.py
+97 -104
View File
@@ -32,28 +32,30 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
super(DocumentsViewsTestCase, self).setUp()
self.login_user()
def test_document_view_no_permissions(self):
response = self.get(
'documents:document_properties', args=(self.document.pk,)
def _request_document_properties_view(self):
return self.get(
viewname='documents:document_properties',
args=(self.document.pk,)
)
def test_document_view_no_permissions(self):
response = self._request_document_properties_view()
self.assertEqual(response.status_code, 403)
def test_document_view_with_permissions(self):
self.grant_access(
obj=self.document, permission=permission_document_view
)
response = self.get(
'documents:document_properties', args=(self.document.pk,),
follow=True
response = self._request_document_properties_view()
self.assertContains(
response=response, text=self.document.label, status_code=200
)
self.assertContains(
response, 'roperties for document', status_code=200
)
def _request_document_list_view(self):
return self.get(viewname='documents:document_list')
def test_document_list_view_no_permissions(self):
response = self.get('documents:document_list')
response = self._request_document_list_view()
self.assertEqual(response.status_code, 200)
self.assertEqual(response.context['object_list'].count(), 0)
@@ -61,12 +63,14 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
self.grant_access(
obj=self.document, permission=permission_document_view
)
response = self.get('documents:document_list')
self.assertContains(response, self.document.label, status_code=200)
response = self._request_document_list_view()
self.assertContains(
response=response, text=self.document.label, status_code=200
)
def _request_document_type_edit(self, document_type):
return self.post(
'documents:document_document_type_edit',
viewname='documents:document_document_type_edit',
args=(self.document.pk,),
data={'document_type': document_type.pk}
)
@@ -85,7 +89,7 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
)
self.assertContains(
response, text='Select a valid choice', status_code=200
response=response, text='Select a valid choice', status_code=200
)
self.assertEqual(
@@ -122,7 +126,7 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
def _request_multiple_document_type_edit(self, document_type):
return self.post(
'documents:document_multiple_document_type_edit',
viewname='documents:document_multiple_document_type_edit',
data={
'id_list': self.document.pk,
'document_type': document_type.pk
@@ -143,7 +147,7 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
)
self.assertContains(
response, text='Select a valid choice.', status_code=200
response=response, text='Select a valid choice.', status_code=200
)
self.assertEqual(
@@ -178,15 +182,15 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
def _request_document_download_form_view(self):
return self.get(
'documents:document_download_form', args=(self.document.pk,),
follow=True,
viewname='documents:document_download_form',
args=(self.document.pk,),
)
def test_document_download_form_view_no_permission(self):
response = self._request_document_download_form_view()
self.assertNotContains(
response, text=self.document.label, status_code=200
response=response, text=self.document.label, status_code=200
)
def test_document_download_form_view_with_access(self):
@@ -196,14 +200,16 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
response = self._request_document_download_form_view()
self.assertContains(
response, text=self.document.label, status_code=200
response=response, text=self.document.label, status_code=200
)
def _request_document_download_view(self):
return self.get(
viewname='documents:document_download', args=(self.document.pk,)
)
def test_document_download_view_no_permission(self):
response = self.get(
'documents:document_download', args=(self.document.pk,)
)
response = self._request_document_download_view()
self.assertEqual(response.status_code, 403)
def test_document_download_view_with_permission(self):
@@ -216,25 +222,24 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
self.grant_access(
obj=self.document, permission=permission_document_download
)
response = self.get(
'documents:document_download', args=(self.document.pk,)
)
response = self._request_document_download_view()
self.assertEqual(response.status_code, 200)
with self.document.open() as file_object:
self.assert_download_response(
response, content=file_object.read(),
response=response, content=file_object.read(),
basename=TEST_SMALL_DOCUMENT_FILENAME,
mime_type=self.document.file_mimetype
)
def test_document_multiple_download_view_no_permission(self):
response = self.get(
'documents:document_multiple_download',
def _request_document_multiple_download_view(self):
return self.get(
viewname='documents:document_multiple_download',
data={'id_list': self.document.pk}
)
def test_document_multiple_download_view_no_permission(self):
response = self._request_document_multiple_download_view()
self.assertEqual(response.status_code, 403)
def test_document_multiple_download_view_with_permission(self):
@@ -247,16 +252,12 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
obj=self.document, permission=permission_document_download
)
response = self.get(
'documents:document_multiple_download',
data={'id_list': self.document.pk}
)
response = self._request_document_multiple_download_view()
self.assertEqual(response.status_code, 200)
with self.document.open() as file_object:
self.assert_download_response(
response, content=file_object.read(),
response=response, content=file_object.read(),
basename=TEST_SMALL_DOCUMENT_FILENAME,
mime_type=self.document.file_mimetype
)
@@ -264,14 +265,13 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
def _request_document_version_download(self, data=None):
data = data or {}
return self.get(
'documents:document_version_download', args=(
viewname='documents:document_version_download', args=(
self.document.latest_version.pk,
), data=data
)
def test_document_version_download_view_no_permission(self):
response = self._request_document_version_download()
self.assertEqual(response.status_code, 403)
def test_document_version_download_view_with_permission(self):
@@ -285,12 +285,11 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
obj=self.document, permission=permission_document_download
)
response = self._request_document_version_download()
self.assertEqual(response.status_code, 200)
with self.document.open() as file_object:
self.assert_download_response(
response, content=file_object.read(),
response=response, content=file_object.read(),
basename=force_text(self.document.latest_version),
mime_type='{}; charset=utf-8'.format(
self.document.latest_version.mimetype
@@ -315,7 +314,7 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
with self.document.open() as file_object:
self.assert_download_response(
response, content=file_object.read(),
response=response, content=file_object.read(),
basename=self.document.latest_version.get_rendered_string(
preserve_extension=True
), mime_type='{}; charset=utf-8'.format(
@@ -323,14 +322,17 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
)
)
def _request_document_update_page_count_view(self):
return self.post(
viewname='documents:document_update_page_count',
args=(self.document.pk,)
)
def test_document_update_page_count_view_no_permission(self):
self.document.pages.all().delete()
self.assertEqual(self.document.pages.count(), 0)
response = self.post(
'documents:document_update_page_count', args=(self.document.pk,)
)
response = self._request_document_update_page_count_view()
self.assertEqual(response.status_code, 302)
self.assertEqual(self.document.pages.count(), 0)
@@ -343,22 +345,21 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
self.grant_permission(permission=permission_document_tools)
response = self.post(
'documents:document_update_page_count',
args=(self.document.pk,)
)
response = self._request_document_update_page_count_view()
self.assertEqual(response.status_code, 302)
self.assertEqual(self.document.pages.count(), page_count)
def _request_document_multiple_update_page_count_view(self):
return self.post(
viewname='documents:document_multiple_update_page_count',
data={'id_list': self.document.pk}
)
def test_document_multiple_update_page_count_view_no_permission(self):
self.document.pages.all().delete()
self.assertEqual(self.document.pages.count(), 0)
response = self.post(
'documents:document_multiple_update_page_count',
data={'id_list': self.document.pk}
)
response = self._request_document_multiple_update_page_count_view()
self.assertEqual(response.status_code, 302)
self.assertEqual(self.document.pages.count(), 0)
@@ -369,13 +370,16 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
self.grant_permission(permission=permission_document_tools)
response = self.post(
'documents:document_multiple_update_page_count',
data={'id_list': self.document.pk}
)
response = self._request_document_multiple_update_page_count_view()
self.assertEqual(response.status_code, 302)
self.assertEqual(self.document.pages.count(), page_count)
def _request_document_clear_transformations_view(self):
return self.post(
viewname='documents:document_clear_transformations',
args=(self.document.pk,)
)
def test_document_clear_transformations_view_no_permission(self):
document_page = self.document.pages.first()
content_type = ContentType.objects.get_for_model(document_page)
@@ -394,11 +398,7 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
obj=self.document, permission=permission_document_view
)
response = self.post(
'documents:document_clear_transformations',
args=(self.document.pk,)
)
response = self._request_document_clear_transformations_view()
self.assertEqual(response.status_code, 302)
self.assertQuerysetEqual(
Transformation.objects.get_for_model(document_page),
@@ -425,16 +425,18 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
obj=self.document, permission=permission_document_view
)
response = self.post(
'documents:document_clear_transformations',
args=(self.document.pk,)
)
response = self._request_document_clear_transformations_view()
self.assertEqual(response.status_code, 302)
self.assertEqual(
Transformation.objects.get_for_model(document_page).count(), 0
)
def _request_document_multiple_clear_transformations(self):
return self.post(
viewname='documents:document_multiple_clear_transformations',
data={'id_list': self.document.pk}
)
def test_document_multiple_clear_transformations_view_no_permission(self):
document_page = self.document.pages.first()
content_type = ContentType.objects.get_for_model(document_page)
@@ -451,11 +453,7 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
self.grant_permission(permission=permission_document_view)
response = self.post(
'documents:document_multiple_clear_transformations',
data={'id_list': self.document.pk}
)
response = self._request_document_multiple_clear_transformations()
self.assertEqual(response.status_code, 302)
self.assertQuerysetEqual(
Transformation.objects.get_for_model(document_page),
@@ -483,27 +481,21 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
obj=self.document, permission=permission_transformation_delete
)
response = self.post(
'documents:document_multiple_clear_transformations',
data={'id_list': self.document.pk}, follow=True
)
self.assertEqual(response.status_code, 200)
response = self._request_document_multiple_clear_transformations()
self.assertEqual(response.status_code, 302)
self.assertEqual(
Transformation.objects.get_for_model(document_page).count(), 0
)
def _empty_trash(self):
return self.post('documents:trash_can_empty')
def _request_empty_trash_view(self):
return self.post(viewname='documents:trash_can_empty')
def test_trash_can_empty_view_no_permission(self):
self.document.delete()
self.assertEqual(DeletedDocument.objects.count(), 1)
response = self._empty_trash()
response = self._request_empty_trash_view()
self.assertEqual(response.status_code, 403)
self.assertEqual(DeletedDocument.objects.count(), 1)
def test_trash_can_empty_view_with_permission(self):
@@ -512,39 +504,39 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
self.grant_permission(permission=permission_empty_trash)
response = self._empty_trash()
response = self._request_empty_trash_view()
self.assertEqual(response.status_code, 302)
self.assertEqual(DeletedDocument.objects.count(), 0)
self.assertEqual(Document.objects.count(), 0)
def test_document_page_view_no_permissions(self):
response = self.get(
'documents:document_page_view', args=(
self.document.pages.first().pk,
def _request_document_page_view(self, document_page):
return self.get(
viewname='documents:document_page_view', args=(
document_page.pk,
)
)
def test_document_page_view_no_permissions(self):
response = self._request_document_page_view(
document_page=self.document.pages.first()
)
self.assertEqual(response.status_code, 403)
def test_document_page_view_with_access(self):
self.grant_access(
obj=self.document, permission=permission_document_view
)
response = self.get(
'documents:document_page_view', args=(
self.document.pages.first().pk,
),
follow=True
response = self._request_document_page_view(
document_page=self.document.pages.first()
)
self.assertContains(
response, force_text(self.document.pages.first()), status_code=200
response=response, text=force_text(self.document.pages.first()),
status_code=200
)
def _request_print_view(self):
def _request_document_print_view(self):
return self.get(
'documents:document_print', args=(
viewname='documents:document_print', args=(
self.document.pk,
), data={
'page_group': PAGE_RANGE_ALL
@@ -552,14 +544,14 @@ class DocumentsViewsTestCase(GenericDocumentViewTestCase):
)
def test_document_print_view_no_access(self):
response = self ._request_print_view()
response = self._request_document_print_view()
self.assertEqual(response.status_code, 403)
def test_document_print_view_with_access(self):
self.grant_access(
obj=self.document, permission=permission_document_print
)
response = self._request_print_view()
response = self._request_document_print_view()
self.assertEqual(response.status_code, 200)
@@ -571,7 +563,8 @@ class DocumentsQuickLabelViewsTestCase(DocumentTypeQuickLabelTestMixin, GenericD
def _request_document_quick_label_edit_view(self, extra_data=None):
data = {
'document_type_available_filenames': self.document_type_filename.pk,
'label': '' # View needs at least an empty label for quick
'label': ''
# View needs at least an empty label for quick
# label to work. Cause is unknown.
}
data.update(extra_data or {})
mayan/apps/documents/tests/test_duplicated_document_views.py
+13 -12
View File
@@ -16,25 +16,26 @@ class DuplicatedDocumentsViewsTestCase(GenericDocumentViewTestCase):
self.login_user()
def _upload_duplicate_document(self):
with open(TEST_SMALL_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_SMALL_DOCUMENT_PATH, mode='rb') as file_object:
self.document_duplicate = self.document_type.new_document(
file_object=file_object, label=TEST_SMALL_DOCUMENT_FILENAME
)
def _request_duplicated_document_list(self):
return self.get('documents:duplicated_document_list')
def _request_duplicated_document_list_view(self):
return self.get(viewname='documents:duplicated_document_list')
def _request_document_duplicates_list(self):
def _request_document_duplicates_list_view(self):
return self.get(
'documents:document_duplicates_list', args=(self.document.pk,)
viewname='documents:document_duplicates_list',
args=(self.document.pk,)
)
def test_duplicated_document_list_no_permissions(self):
self._upload_duplicate_document()
response = self._request_duplicated_document_list()
response = self._request_duplicated_document_list_view()
self.assertNotContains(
response, text=self.document.label, status_code=200
response=response, text=self.document.label, status_code=200
)
def test_duplicated_document_list_with_access(self):
@@ -46,15 +47,15 @@ class DuplicatedDocumentsViewsTestCase(GenericDocumentViewTestCase):
obj=self.document_duplicate,
permission=permission_document_view
)
response = self._request_duplicated_document_list()
response = self._request_duplicated_document_list_view()
self.assertContains(
response, text=self.document.label, status_code=200
response=response, text=self.document.label, status_code=200
)
def test_document_duplicates_list_no_permissions(self):
self._upload_duplicate_document()
response = self._request_document_duplicates_list()
response = self._request_document_duplicates_list_view()
self.assertEqual(response.status_code, 403)
@@ -67,8 +68,8 @@ class DuplicatedDocumentsViewsTestCase(GenericDocumentViewTestCase):
obj=self.document_duplicate,
permission=permission_document_view
)
response = self._request_document_duplicates_list()
response = self._request_document_duplicates_list_view()
self.assertContains(
response, text=self.document.label, status_code=200
response=response, text=self.document.label, status_code=200
)
mayan/apps/documents/tests/test_events.py
+3 -3
View File
@@ -52,7 +52,7 @@ class DocumentEventsTestCase(GenericDocumentViewTestCase):
self.expected_content_type = 'image/png; charset=utf-8'
response = self.get(
'documents:document_download', args=(self.document.pk,),
viewname='documents:document_download', args=(self.document.pk,),
)
# Download the file to close the file descriptor
@@ -76,7 +76,7 @@ class DocumentEventsTestCase(GenericDocumentViewTestCase):
Action.objects.all().delete()
response = self.get(
'documents:document_preview', args=(self.document.pk,)
viewname='documents:document_preview', args=(self.document.pk,)
)
self.assertEqual(response.status_code, 403)
@@ -93,7 +93,7 @@ class DocumentEventsTestCase(GenericDocumentViewTestCase):
permission_document_view.stored_permission
)
self.get(
'documents:document_preview', args=(self.document.pk,),
viewname='documents:document_preview', args=(self.document.pk,),
)
event = Action.objects.any(obj=self.document).first()
mayan/apps/documents/tests/test_links.py
+3 -3
View File
@@ -23,7 +23,7 @@ from .literals import TEST_SMALL_DOCUMENT_PATH
class DocumentsLinksTestCase(GenericDocumentViewTestCase):
def test_document_version_revert_link_no_permission(self):
with open(TEST_SMALL_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_SMALL_DOCUMENT_PATH, mode='rb') as file_object:
self.document.new_version(file_object=file_object)
self.assertTrue(self.document.versions.count(), 2)
@@ -39,9 +39,9 @@ class DocumentsLinksTestCase(GenericDocumentViewTestCase):
def test_document_version_revert_link_with_permission(self):
# Needed by MySQL as milliseconds value is not store in timestamp
# field
time.sleep(2)
time.sleep(1.01)
with open(TEST_SMALL_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_SMALL_DOCUMENT_PATH, mode='rb') as file_object:
self.document.new_version(file_object=file_object)
self.assertTrue(self.document.versions.count(), 2)
mayan/apps/documents/tests/test_models.py
+3 -4
View File
@@ -18,7 +18,7 @@ from .literals import (
TEST_PDF_INDIRECT_ROTATE_PATH, TEST_OFFICE_DOCUMENT_PATH,
TEST_SMALL_DOCUMENT_CHECKSUM, TEST_SMALL_DOCUMENT_FILENAME,
TEST_SMALL_DOCUMENT_MIMETYPE, TEST_SMALL_DOCUMENT_PATH,
TEST_SMALL_DOCUMENT_SIZE, TEST_DOCUMENT_FILENAME
TEST_SMALL_DOCUMENT_SIZE
)
from .mixins import DocumentTestMixin
@@ -27,7 +27,6 @@ from .mixins import DocumentTestMixin
class DocumentTestCase(DocumentTestMixin, BaseTestCase):
def test_natural_keys(self):
self.document.pages.first().generate_image()
self._test_database_conversion('documents')
def test_document_creation(self):
@@ -47,10 +46,10 @@ class DocumentTestCase(DocumentTestMixin, BaseTestCase):
self.assertEqual(self.document.page_count, 1)
def test_version_creation(self):
with open(TEST_SMALL_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_SMALL_DOCUMENT_PATH, mode='rb') as file_object:
self.document.new_version(file_object=file_object)
with open(TEST_SMALL_DOCUMENT_PATH, 'rb') as file_object:
with open(TEST_SMALL_DOCUMENT_PATH, mode='rb') as file_object:
self.document.new_version(
file_object=file_object, comment='test comment 1'
)
mayan/apps/documents/tests/test_search.py
+8 -4
View File
@@ -12,12 +12,12 @@ from documents.tests import DocumentTestMixin
class DocumentSearchTestCase(DocumentTestMixin, BaseTestCase):
def _perform_document_page_search(self):
return document_page_search.search(
{'q': self.document.label}, user=self.user
query_string={'q': self.document.label}, user=self.user
)
def _perform_document_search(self):
return document_search.search(
{'q': self.document.label}, user=self.user
query_string={'q': self.document.label}, user=self.user
)
def test_document_page_search_no_access(self):
@@ -25,7 +25,9 @@ class DocumentSearchTestCase(DocumentTestMixin, BaseTestCase):
self.assertFalse(self.document.pages.first() in queryset)
def test_document_page_search_with_access(self):
self.grant_access(permission=permission_document_view, obj=self.document)
self.grant_access(
permission=permission_document_view, obj=self.document
)
queryset, elapsed_time = self._perform_document_page_search()
self.assertTrue(self.document.pages.first() in queryset)
@@ -34,6 +36,8 @@ class DocumentSearchTestCase(DocumentTestMixin, BaseTestCase):
self.assertFalse(self.document in queryset)
def test_document_search_with_access(self):
self.grant_access(permission=permission_document_view, obj=self.document)
self.grant_access(
permission=permission_document_view, obj=self.document
)
queryset, elapsed_time = self._perform_document_search()
self.assertTrue(self.document in queryset)