From 0188afcd5417c606715c22548f70a39426dc5ae5 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 11 Apr 2019 22:57:39 -0400 Subject: [PATCH] Consolidate repeated test user logins Signed-off-by: Roberto Rosario --- mayan/apps/acls/tests/test_links.py | 8 +-- mayan/apps/acls/tests/test_views.py | 17 +------ mayan/apps/common/tests/test_views.py | 7 ++- mayan/apps/django_gpg/tests/test_views.py | 12 ++--- .../document_signatures/tests/test_views.py | 28 ++-------- mayan/apps/documents/tests/test_links.py | 51 ++++++++----------- mayan/apps/mailer/tests/test_views.py | 25 ++------- .../apps/mayan_statistics/tests/test_views.py | 10 ++-- mayan/apps/metadata/tests/test_events.py | 10 ++-- mayan/apps/metadata/tests/test_views.py | 35 ++----------- mayan/apps/sources/tests/test_views.py | 21 ++------ mayan/apps/tags/tests/test_events.py | 10 ++-- mayan/apps/tags/tests/test_views.py | 30 ++++------- mayan/apps/task_manager/tests/test_views.py | 17 +------ 14 files changed, 69 insertions(+), 212 deletions(-) diff --git a/mayan/apps/acls/tests/test_links.py b/mayan/apps/acls/tests/test_links.py index ec8a9e2ea7..52d12facdd 100644 --- a/mayan/apps/acls/tests/test_links.py +++ b/mayan/apps/acls/tests/test_links.py @@ -13,13 +13,16 @@ from ..permissions import permission_acl_edit, permission_acl_view class ACLsLinksTestCase(GenericDocumentViewTestCase): + def setUp(self): + super(ACLsLinksTestCase, self).setUp() + self.login_user() + def test_document_acl_create_link(self): acl = AccessControlList.objects.create( content_object=self.document, role=self.role ) acl.permissions.add(permission_acl_edit.stored_permission) - self.login_user() self.add_test_view(test_object=self.document) context = self.get_test_view() @@ -44,7 +47,6 @@ class ACLsLinksTestCase(GenericDocumentViewTestCase): ) acl.permissions.add(permission_acl_edit.stored_permission) - self.login_user() self.add_test_view(test_object=acl) context = self.get_test_view() @@ -62,7 +64,6 @@ class ACLsLinksTestCase(GenericDocumentViewTestCase): ) acl.permissions.add(permission_acl_edit.stored_permission) - self.login_user() self.add_test_view(test_object=acl) context = self.get_test_view() @@ -80,7 +81,6 @@ class ACLsLinksTestCase(GenericDocumentViewTestCase): ) acl.permissions.add(permission_acl_view.stored_permission) - self.login_user() self.add_test_view(test_object=self.document) context = self.get_test_view() diff --git a/mayan/apps/acls/tests/test_views.py b/mayan/apps/acls/tests/test_views.py index 38f98f0d5d..023db442ac 100644 --- a/mayan/apps/acls/tests/test_views.py +++ b/mayan/apps/acls/tests/test_views.py @@ -19,10 +19,9 @@ class AccessControlListViewTestCase(GenericDocumentViewTestCase): 'model': content_type.model, 'object_id': self.document.pk } - - def test_acl_create_view_no_permission(self): self.login_user() + def test_acl_create_view_no_permission(self): response = self.get( viewname='acls:acl_create', kwargs=self.view_arguments, data={ 'role': self.role.pk @@ -33,8 +32,6 @@ class AccessControlListViewTestCase(GenericDocumentViewTestCase): self.assertEqual(AccessControlList.objects.count(), 0) def test_acl_create_view_with_permission(self): - self.login_user() - self.role.permissions.add( permission_acl_edit.stored_permission ) @@ -50,8 +47,6 @@ class AccessControlListViewTestCase(GenericDocumentViewTestCase): ) def test_acl_create_view_post_no_permission(self): - self.login_user() - response = self.post( viewname='acls:acl_create', kwargs=self.view_arguments, data={ 'role': self.role.pk @@ -62,8 +57,6 @@ class AccessControlListViewTestCase(GenericDocumentViewTestCase): self.assertEqual(AccessControlList.objects.count(), 0) def test_acl_create_view_with_post_permission(self): - self.login_user() - self.role.permissions.add( permission_acl_edit.stored_permission ) @@ -86,8 +79,6 @@ class AccessControlListViewTestCase(GenericDocumentViewTestCase): content_object=self.document, role=self.role ) - self.login_user() - self.role.permissions.add( permission_acl_edit.stored_permission ) @@ -109,8 +100,6 @@ class AccessControlListViewTestCase(GenericDocumentViewTestCase): Test creating an ACL entry for an object with no model permissions. Result: Should display a blank permissions list (not optgroup) """ - self.login_user() - self.role.permissions.add( permission_acl_edit.stored_permission ) @@ -135,8 +124,6 @@ class AccessControlListViewTestCase(GenericDocumentViewTestCase): self.assertEqual(AccessControlList.objects.count(), 1) def test_acl_list_view_no_permission(self): - self.login_user() - document = self.document.add_as_recent_document_for_user( self.user ).document @@ -162,8 +149,6 @@ class AccessControlListViewTestCase(GenericDocumentViewTestCase): self.assertNotContains(response, text='otal: 1', status_code=403) def test_acl_list_view_with_permission(self): - self.login_user() - self.role.permissions.add( permission_acl_view.stored_permission ) diff --git a/mayan/apps/common/tests/test_views.py b/mayan/apps/common/tests/test_views.py index 911c9481b3..3ea6538b05 100644 --- a/mayan/apps/common/tests/test_views.py +++ b/mayan/apps/common/tests/test_views.py @@ -13,9 +13,11 @@ from .literals import TEST_ERROR_LOG_ENTRY_RESULT class CommonViewTestCase(GenericViewTestCase): - def test_about_view(self): + def setUp(self): + super(CommonViewTestCase, self).setUp() self.login_user() + def test_about_view(self): response = self.get('common:about_view') self.assertContains(response, text='About', status_code=200) @@ -43,7 +45,6 @@ class CommonViewTestCase(GenericViewTestCase): def test_object_error_list_view_with_permissions(self): self._create_error_log_entry() - self.login_user() self.grant_access( obj=self.user, permission=permission_error_log_view ) @@ -58,8 +59,6 @@ class CommonViewTestCase(GenericViewTestCase): def test_object_error_list_view_no_permissions(self): self._create_error_log_entry() - self.login_user() - response = self._request_object_error_log_list() self.assertNotContains( diff --git a/mayan/apps/django_gpg/tests/test_views.py b/mayan/apps/django_gpg/tests/test_views.py index 39cb0164be..95050b4d8e 100644 --- a/mayan/apps/django_gpg/tests/test_views.py +++ b/mayan/apps/django_gpg/tests/test_views.py @@ -11,11 +11,13 @@ from .literals import TEST_KEY_DATA, TEST_KEY_FINGERPRINT class KeyViewTestCase(GenericViewTestCase): + def setUp(self): + super(KeyViewTestCase, self).setUp() + self.login_user() + def test_key_download_view_no_permission(self): key = Key.objects.create(key_data=TEST_KEY_DATA) - self.login_user() - response = self.get( viewname='django_gpg:key_download', args=(key.pk,) ) @@ -25,8 +27,6 @@ class KeyViewTestCase(GenericViewTestCase): def test_key_download_view_with_permission(self): key = Key.objects.create(key_data=TEST_KEY_DATA) - self.login_user() - self.role.permissions.add(permission_key_download.stored_permission) self.expected_content_type = 'application/octet-stream; charset=utf-8' @@ -41,8 +41,6 @@ class KeyViewTestCase(GenericViewTestCase): ) def test_key_upload_view_no_permission(self): - self.login_user() - response = self.post( viewname='django_gpg:key_upload', data={'key_data': TEST_KEY_DATA} ) @@ -51,8 +49,6 @@ class KeyViewTestCase(GenericViewTestCase): self.assertEqual(Key.objects.count(), 0) def test_key_upload_view_with_permission(self): - self.login_user() - self.role.permissions.add(permission_key_upload.stored_permission) response = self.post( diff --git a/mayan/apps/document_signatures/tests/test_views.py b/mayan/apps/document_signatures/tests/test_views.py index 870a682a02..befe4c0247 100644 --- a/mayan/apps/document_signatures/tests/test_views.py +++ b/mayan/apps/document_signatures/tests/test_views.py @@ -30,6 +30,10 @@ TEST_SIGNED_DOCUMENT_COUNT = 2 class SignaturesViewTestCase(GenericDocumentViewTestCase): + def setUp(self): + super(SignaturesViewTestCase, self).setUp() + self.login_user() + def _request_document_version_signature_list_view(self, document): return self.get( viewname='signatures:document_version_signature_list', @@ -51,8 +55,6 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase): signature_file=File(file_object) ) - self.login_user() - response = self._request_document_version_signature_list_view( document=document ) @@ -73,8 +75,6 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase): signature_file=File(file_object) ) - self.login_user() - self.grant_access( obj=document, permission=permission_document_version_signature_view @@ -107,8 +107,6 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase): signature_file=File(file_object) ) - self.login_user() - response = self._request_document_version_signature_details_view( signature=signature ) @@ -129,8 +127,6 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase): signature_file=File(file_object) ) - self.login_user() - self.grant_access( obj=document, permission=permission_document_version_signature_view @@ -157,8 +153,6 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase): file_object=file_object ) - self.login_user() - response = self._request_document_version_signature_upload_view( document_version=document.latest_version ) @@ -171,8 +165,6 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase): file_object=file_object ) - self.login_user() - self.grant_access( obj=document, permission=permission_document_version_signature_upload @@ -202,8 +194,6 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase): signature_file=File(file_object) ) - self.login_user() - response = self._request_document_version_signature_download_view( signature=signature ) @@ -221,8 +211,6 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase): signature_file=File(file_object) ) - self.login_user() - self.grant_access( obj=document, permission=permission_document_version_signature_download @@ -260,8 +248,6 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase): signature_file=File(file_object) ) - self.login_user() - self.grant_access( obj=document, permission=permission_document_version_signature_view @@ -288,8 +274,6 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase): signature_file=File(file_object) ) - self.login_user() - self.grant_access( obj=document, permission=permission_document_version_signature_delete @@ -338,8 +322,6 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase): DocumentVersion._post_save_hooks = old_hooks - self.login_user() - response = self._request_all_document_version_signature_verify_view() self.assertEqual(response.status_code, 403) @@ -376,8 +358,6 @@ class SignaturesViewTestCase(GenericDocumentViewTestCase): DocumentVersion._post_save_hooks = old_hooks - self.login_user() - self.grant_permission( permission=permission_document_version_signature_verify ) diff --git a/mayan/apps/documents/tests/test_links.py b/mayan/apps/documents/tests/test_links.py index a08ebdf210..a4744fd948 100644 --- a/mayan/apps/documents/tests/test_links.py +++ b/mayan/apps/documents/tests/test_links.py @@ -12,6 +12,7 @@ from ..links import ( link_document_restore, link_document_version_download, link_document_version_revert ) +from ..models import DeletedDocument from ..permissions import ( permission_document_download, permission_document_restore, permission_document_version_revert @@ -22,14 +23,16 @@ from .literals import TEST_SMALL_DOCUMENT_PATH class DocumentsLinksTestCase(GenericDocumentViewTestCase): + def setUp(self): + super(DocumentsLinksTestCase, self).setUp() + self.login_user() + def test_document_version_revert_link_no_permission(self): 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) - self.login_user() - self.add_test_view(test_object=self.document.versions.first()) context = self.get_test_view() resolved_link = link_document_version_revert.resolve(context=context) @@ -46,8 +49,6 @@ class DocumentsLinksTestCase(GenericDocumentViewTestCase): self.assertTrue(self.document.versions.count(), 2) - self.login_user() - acl = AccessControlList.objects.create( content_object=self.document, role=self.role ) @@ -69,8 +70,6 @@ class DocumentsLinksTestCase(GenericDocumentViewTestCase): ) def test_document_version_download_link_no_permission(self): - self.login_user() - self.add_test_view(test_object=self.document.latest_version) context = self.get_test_view() resolved_link = link_document_version_download.resolve(context=context) @@ -78,8 +77,6 @@ class DocumentsLinksTestCase(GenericDocumentViewTestCase): self.assertEqual(resolved_link, None) def test_document_version_download_link_with_permission(self): - self.login_user() - acl = AccessControlList.objects.create( content_object=self.document, role=self.role ) @@ -100,38 +97,30 @@ class DocumentsLinksTestCase(GenericDocumentViewTestCase): class DeletedDocumentsLinksTestCase(GenericDocumentViewTestCase): - def test_deleted_document_restore_link_no_permission(self): - self.document.delete() - + def setUp(self): + super(DeletedDocumentsLinksTestCase, self).setUp() self.login_user() + self.document.delete() + self.test_deleted_document = DeletedDocument.objects.get( + pk=self.document.pk + ) + self.add_test_view(test_object=self.test_deleted_document) + self.context = self.get_test_view() - self.add_test_view(test_object=self.document) - context = self.get_test_view() - resolved_link = link_document_restore.resolve(context=context) - + def test_deleted_document_restore_link_no_permission(self): + resolved_link = link_document_restore.resolve(context=self.context) self.assertEqual(resolved_link, None) def test_deleted_document_restore_link_with_permission(self): - self.document.delete() - - self.login_user() - - acl = AccessControlList.objects.create( - content_object=self.document, role=self.role + self.grant_access( + obj=self.document, permission=permission_document_restore ) - acl.permissions.add( - permission_document_restore.stored_permission - ) - - self.add_test_view(test_object=self.document) - context = self.get_test_view() - resolved_link = link_document_restore.resolve(context=context) - + resolved_link = link_document_restore.resolve(context=self.context) self.assertNotEqual(resolved_link, None) self.assertEqual( resolved_link.url, reverse( - 'documents:document_restore', - args=(self.document.pk,) + viewname=link_document_restore.view, + args=(self.test_deleted_document.pk,) ) ) diff --git a/mayan/apps/mailer/tests/test_views.py b/mayan/apps/mailer/tests/test_views.py index 129c3f412c..4f093cbb20 100644 --- a/mayan/apps/mailer/tests/test_views.py +++ b/mayan/apps/mailer/tests/test_views.py @@ -23,6 +23,10 @@ from .mixins import MailerTestMixin class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): + def setUp(self): + super(MailerViewsTestCase, self).setUp() + self.login_user() + def _request_document_link_send(self): return self.post( 'mailer:send_document_link', args=(self.document.pk,), @@ -72,7 +76,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): def test_mail_link_view_no_permissions(self): self._create_user_mailer() - self.login_user() response = self._request_document_link_send() @@ -82,7 +85,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): def test_mail_link_view_with_permission(self): self._create_user_mailer() - self.login_user() self.grant_permission(permission=permission_mailing_link) self.grant_permission(permission=permission_user_mailer_use) @@ -94,7 +96,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): def test_mail_document_view_no_permissions(self): self._create_user_mailer() - self.login_user() response = self._request_document_send() self.assertContains( @@ -103,7 +104,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): def test_mail_document_view_with_permission(self): self._create_user_mailer() - self.login_user() self.grant_permission(permission=permission_mailing_send_document) self.grant_permission(permission=permission_user_mailer_use) @@ -114,7 +114,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): self.assertEqual(mail.outbox[0].to, [TEST_EMAIL_ADDRESS]) def test_user_mailer_create_view_no_permissions(self): - self.login_user() self.grant_permission(permission=permission_user_mailer_view) response = self._request_user_mailer_create() @@ -125,7 +124,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): self.assertEqual(UserMailer.objects.count(), 0) def test_user_mailer_create_view_with_permissions(self): - self.login_user() self.grant_permission(permission=permission_user_mailer_create) self.grant_permission(permission=permission_user_mailer_view) @@ -139,7 +137,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): def test_user_mailer_delete_view_no_permissions(self): self._create_user_mailer() - self.login_user() self._request_user_mailer_delete() @@ -149,7 +146,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): def test_user_mailer_delete_view_with_access(self): self._create_user_mailer() - self.login_user() self.grant_access( obj=self.user_mailer, permission=permission_user_mailer_delete @@ -161,7 +157,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): def test_user_mailer_list_view_no_permissions(self): self._create_user_mailer() - self.login_user() response = self.get( 'mailer:user_mailer_list', @@ -172,7 +167,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): def test_user_mailer_list_view_with_permissions(self): self._create_user_mailer() - self.login_user() self.grant_permission(permission=permission_user_mailer_view) @@ -186,7 +180,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): def test_user_mailer_test_view_no_permissions(self): self._create_user_mailer() - self.login_user() response = self._request_user_mailer_test() @@ -196,7 +189,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): def test_user_mailer_test_view_with_access(self): self._create_user_mailer() - self.login_user() self.grant_access( obj=self.user_mailer, permission=permission_user_mailer_use @@ -210,7 +202,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): def test_send_multiple_recipients_comma(self): self._create_user_mailer() - self.login_user() self.grant_access( obj=self.user_mailer, permission=permission_user_mailer_use @@ -226,7 +217,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): def test_send_multiple_recipients_mixed(self): self._create_user_mailer() - self.login_user() self.grant_access( obj=self.user_mailer, permission=permission_user_mailer_use @@ -242,7 +232,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): def test_send_multiple_recipients_semicolon(self): self._create_user_mailer() - self.login_user() self.grant_access( obj=self.user_mailer, permission=permission_user_mailer_use @@ -258,7 +247,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): def test_mail_link_view_recipients_comma(self): self._create_user_mailer() - self.login_user() self.grant_permission(permission=permission_mailing_link) self.grant_permission(permission=permission_user_mailer_use) @@ -273,7 +261,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): def test_mail_link_view_recipients_mixed(self): self._create_user_mailer() - self.login_user() self.grant_permission(permission=permission_mailing_link) self.grant_permission(permission=permission_user_mailer_use) @@ -288,7 +275,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): def test_mail_link_view_recipients_semicolon(self): self._create_user_mailer() - self.login_user() self.grant_permission(permission=permission_mailing_link) self.grant_permission(permission=permission_user_mailer_use) @@ -303,7 +289,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): def test_mail_document_view_recipients_comma(self): self._create_user_mailer() - self.login_user() self.grant_permission(permission=permission_mailing_send_document) self.grant_permission(permission=permission_user_mailer_use) @@ -318,7 +303,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): def test_mail_document_view_recipients_mixed(self): self._create_user_mailer() - self.login_user() self.grant_permission(permission=permission_mailing_send_document) self.grant_permission(permission=permission_user_mailer_use) @@ -333,7 +317,6 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): def test_mail_document_view_recipients_semicolon(self): self._create_user_mailer() - self.login_user() self.grant_permission(permission=permission_mailing_send_document) self.grant_permission(permission=permission_user_mailer_use) diff --git a/mayan/apps/mayan_statistics/tests/test_views.py b/mayan/apps/mayan_statistics/tests/test_views.py index 6f673f6493..56537a0aca 100644 --- a/mayan/apps/mayan_statistics/tests/test_views.py +++ b/mayan/apps/mayan_statistics/tests/test_views.py @@ -7,9 +7,11 @@ from ..permissions import permission_statistics_view class StatisticsViewTestCase(GenericViewTestCase): - def test_statistic_detail_view_no_permissions(self): + def setUp(self): + super(StatisticsViewTestCase, self).setUp() self.login_user() + def test_statistic_detail_view_no_permissions(self): statistic = Statistic.get_all()[0] response = self.get( @@ -19,8 +21,6 @@ class StatisticsViewTestCase(GenericViewTestCase): self.assertEqual(response.status_code, 403) def test_statistic_detail_view_with_permissions(self): - self.login_user() - self.grant_permission(permission=permission_statistics_view) statistic = Statistic.get_all()[0] @@ -32,15 +32,11 @@ class StatisticsViewTestCase(GenericViewTestCase): self.assertEqual(response.status_code, 200) def test_statistic_namespace_list_view_no_permissions(self): - self.login_user() - response = self.get('statistics:namespace_list') self.assertEqual(response.status_code, 403) def test_statistic_namespace_list_view_with_permissions(self): - self.login_user() - self.grant_permission(permission=permission_statistics_view) response = self.get('statistics:namespace_list') diff --git a/mayan/apps/metadata/tests/test_events.py b/mayan/apps/metadata/tests/test_events.py index 6c1611433a..7f6172f9c3 100644 --- a/mayan/apps/metadata/tests/test_events.py +++ b/mayan/apps/metadata/tests/test_events.py @@ -16,9 +16,11 @@ from .mixins import MetadataTestsMixin class MetadataTypeEventsTestCase(MetadataTestsMixin, GenericDocumentViewTestCase): - def test_metadata_type_create_event_no_permissions(self): + def setUp(self): + super(MetadataTypeEventsTestCase, self).setUp() self.login_user() + def test_metadata_type_create_event_no_permissions(self): Action.objects.all().delete() response = self._request_metadata_type_create_view() @@ -26,8 +28,6 @@ class MetadataTypeEventsTestCase(MetadataTestsMixin, GenericDocumentViewTestCase self.assertEqual(Action.objects.count(), 0) def test_metadata_type_create_event_with_permissions(self): - self.login_user() - Action.objects.all().delete() self.grant_permission(permission=permission_metadata_type_create) @@ -47,8 +47,6 @@ class MetadataTypeEventsTestCase(MetadataTestsMixin, GenericDocumentViewTestCase def test_metadata_type_edit_event_no_permissions(self): self._create_metadata_type() - self.login_user() - Action.objects.all().delete() response = self._request_metadata_type_edit_view() @@ -58,8 +56,6 @@ class MetadataTypeEventsTestCase(MetadataTestsMixin, GenericDocumentViewTestCase def test_metadata_type_edit_event_with_access(self): self._create_metadata_type() - self.login_user() - Action.objects.all().delete() self.grant_access( diff --git a/mayan/apps/metadata/tests/test_views.py b/mayan/apps/metadata/tests/test_views.py index 7976d42972..acd2827692 100644 --- a/mayan/apps/metadata/tests/test_views.py +++ b/mayan/apps/metadata/tests/test_views.py @@ -41,10 +41,9 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase): ) self.document_type.metadata.create(metadata_type=self.metadata_type) - - def test_metadata_add_view_no_permission(self): self.login_user() + def test_metadata_add_view_no_permission(self): self.grant_permission(permission=permission_document_view) response = self.post( @@ -58,8 +57,6 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase): self.assertEqual(len(self.document.metadata.all()), 0) def test_metadata_add_view_with_permission(self): - self.login_user() - self.grant_permission(permission=permission_document_view) self.grant_permission(permission=permission_metadata_document_add) self.grant_permission(permission=permission_metadata_document_edit) @@ -76,8 +73,6 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase): # Gitlab issue #204 # Problems to add required metadata after changing the document type - self.login_user() - self.grant_permission(permission=permission_document_properties_edit) self.grant_permission(permission=permission_metadata_document_edit) @@ -120,8 +115,6 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase): ) def test_metadata_remove_view_no_permission(self): - self.login_user() - document_metadata = self.document.metadata.create( metadata_type=self.metadata_type, value='' ) @@ -157,8 +150,6 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase): # Silence unrelated logging logging.getLogger('navigation.classes').setLevel(logging.CRITICAL) - self.login_user() - document_metadata = self.document.metadata.create( metadata_type=self.metadata_type, value='' ) @@ -195,8 +186,6 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase): self.assertEqual(len(self.document.metadata.all()), 0) def test_multiple_document_metadata_edit(self): - self.login_user() - self.grant_permission(permission=permission_document_view) self.grant_permission(permission=permission_metadata_document_add) self.grant_permission(permission=permission_metadata_document_edit) @@ -242,8 +231,6 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase): ) def test_multiple_document_metadata_remove(self): - self.login_user() - self.grant_permission(permission=permission_document_view) self.grant_permission(permission=permission_metadata_document_remove) @@ -283,8 +270,6 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase): self.assertEqual(document_2.metadata.count(), 0) def test_multiple_document_metadata_add(self): - self.login_user() - self.grant_permission(permission=permission_document_view) self.grant_permission(permission=permission_metadata_document_add) self.grant_permission(permission=permission_metadata_document_edit) @@ -304,8 +289,6 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase): self.assertContains(response, 'Edit', status_code=200) def test_single_document_multiple_metadata_add_view(self): - self.login_user() - self.grant_permission(permission=permission_document_view) self.grant_permission(permission=permission_metadata_document_add) self.grant_permission(permission=permission_metadata_document_edit) @@ -337,16 +320,16 @@ class MetadataTypeViewTestCase(DocumentTestMixin, MetadataTestsMixin, GenericVie auto_create_document_type = False auto_upload_document = False - def test_metadata_type_create_view_no_permission(self): + def setUp(self): + super(MetadataTypeViewTestCase, self).setUp() self.login_user() + def test_metadata_type_create_view_no_permission(self): response = self._request_metadata_type_create_view() self.assertEqual(response.status_code, 403) def test_metadata_type_create_view_with_access(self): - self.login_user() - self.grant_permission(permission=permission_metadata_type_create) response = self._request_metadata_type_create_view() @@ -363,7 +346,6 @@ class MetadataTypeViewTestCase(DocumentTestMixin, MetadataTestsMixin, GenericVie ) def test_metadata_type_delete_view_no_permission(self): - self.login_user() self._create_metadata_type() response = self._request_metadata_type_delete_view() @@ -380,7 +362,6 @@ class MetadataTypeViewTestCase(DocumentTestMixin, MetadataTestsMixin, GenericVie ) def test_metadata_type_delete_view_with_access(self): - self.login_user() self._create_metadata_type() self.grant_access( @@ -394,7 +375,6 @@ class MetadataTypeViewTestCase(DocumentTestMixin, MetadataTestsMixin, GenericVie self.assertEqual(MetadataType.objects.count(), 0) def test_metadata_type_edit_view_no_permission(self): - self.login_user() self._create_metadata_type() response = self._request_metadata_type_edit_view() @@ -411,7 +391,6 @@ class MetadataTypeViewTestCase(DocumentTestMixin, MetadataTestsMixin, GenericVie ) def test_metadata_type_edit_view_with_access(self): - self.login_user() self._create_metadata_type() self.grant_access( @@ -433,7 +412,6 @@ class MetadataTypeViewTestCase(DocumentTestMixin, MetadataTestsMixin, GenericVie ) def test_metadata_type_list_view_no_permission(self): - self.login_user() self._create_metadata_type() response = self._request_metadata_type_list_view() @@ -442,7 +420,6 @@ class MetadataTypeViewTestCase(DocumentTestMixin, MetadataTestsMixin, GenericVie ) def test_metadata_type_list_view_with_access(self): - self.login_user() self._create_metadata_type() self.grant_access( @@ -455,7 +432,6 @@ class MetadataTypeViewTestCase(DocumentTestMixin, MetadataTestsMixin, GenericVie ) def test_metadata_type_relationship_view_no_permission(self): - self.login_user() self._create_metadata_type() self._create_document_type() self.upload_document() @@ -469,7 +445,6 @@ class MetadataTypeViewTestCase(DocumentTestMixin, MetadataTestsMixin, GenericVie self.assertEqual(self.document_type.metadata.count(), 0) def test_metadata_type_relationship_view_with_document_type_access(self): - self.login_user() self._create_metadata_type() self._create_document_type() self.upload_document() @@ -487,7 +462,6 @@ class MetadataTypeViewTestCase(DocumentTestMixin, MetadataTestsMixin, GenericVie self.assertEqual(self.document_type.metadata.count(), 0) def test_metadata_type_relationship_view_with_metadata_type_access(self): - self.login_user() self._create_metadata_type() self._create_document_type() self.upload_document() @@ -505,7 +479,6 @@ class MetadataTypeViewTestCase(DocumentTestMixin, MetadataTestsMixin, GenericVie self.assertEqual(self.document_type.metadata.count(), 0) def test_metadata_type_relationship_view_with_metadata_type_and_document_type_access(self): - self.login_user() self._create_metadata_type() self._create_document_type() self.upload_document() diff --git a/mayan/apps/sources/tests/test_views.py b/mayan/apps/sources/tests/test_views.py index c8f56a2478..dd5a9838c1 100644 --- a/mayan/apps/sources/tests/test_views.py +++ b/mayan/apps/sources/tests/test_views.py @@ -232,6 +232,7 @@ class StagingFolderViewTestCase(GenericViewTestCase): shutil.copy(TEST_SMALL_DOCUMENT_PATH, self.temporary_directory) self.filename = os.path.basename(TEST_SMALL_DOCUMENT_PATH) + self.login_user() def tearDown(self): fs_cleanup(self.temporary_directory) @@ -245,8 +246,6 @@ class StagingFolderViewTestCase(GenericViewTestCase): ) def test_staging_folder_delete_no_permission(self): - self.login_user() - staging_folder = StagingFolderSource.objects.create( label=TEST_SOURCE_LABEL, folder_path=self.temporary_directory, @@ -265,8 +264,6 @@ class StagingFolderViewTestCase(GenericViewTestCase): self.assertEqual(len(list(staging_folder.get_files())), 1) def test_staging_folder_delete_with_permission(self): - self.login_user() - self.grant_permission(permission=permission_staging_file_delete) staging_folder = StagingFolderSource.objects.create( @@ -288,6 +285,10 @@ class StagingFolderViewTestCase(GenericViewTestCase): class SourcesTestCase(GenericDocumentViewTestCase): + def setUp(self): + super(SourcesTestCase, self).setUp() + self.login_user() + def _create_web_source(self): self.source = WebFormSource.objects.create( enabled=True, label=TEST_SOURCE_LABEL, @@ -300,16 +301,12 @@ class SourcesTestCase(GenericDocumentViewTestCase): def test_source_list_view_no_permission(self): self._create_web_source() - self.login_user() - response = self._request_setup_source_list_view() self.assertEqual(response.status_code, 403) def test_source_list_view_with_permission(self): self._create_web_source() - self.login_user() - self.grant_permission(permission=permission_sources_setup_view) response = self._request_setup_source_list_view() @@ -327,8 +324,6 @@ class SourcesTestCase(GenericDocumentViewTestCase): ) def test_source_create_view_no_permission(self): - self.login_user() - self.grant_permission(permission=permission_sources_setup_view) response = self._request_setup_source_create_view() @@ -337,8 +332,6 @@ class SourcesTestCase(GenericDocumentViewTestCase): self.assertEqual(WebFormSource.objects.count(), 0) def test_source_create_view_with_permission(self): - self.login_user() - self.grant_permission(permission=permission_sources_setup_create) self.grant_permission(permission=permission_sources_setup_view) @@ -358,8 +351,6 @@ class SourcesTestCase(GenericDocumentViewTestCase): def test_source_delete_view_with_permission(self): self._create_web_source() - self.login_user() - self.grant_permission(permission=permission_sources_setup_delete) self.grant_permission(permission=permission_sources_setup_view) @@ -370,8 +361,6 @@ class SourcesTestCase(GenericDocumentViewTestCase): def test_source_delete_view_no_permission(self): self._create_web_source() - self.login_user() - self.grant_permission(permission=permission_sources_setup_view) response = self._request_setup_source_delete_view() diff --git a/mayan/apps/tags/tests/test_events.py b/mayan/apps/tags/tests/test_events.py index fd63cb0533..73f7d6baf1 100644 --- a/mayan/apps/tags/tests/test_events.py +++ b/mayan/apps/tags/tests/test_events.py @@ -12,9 +12,11 @@ from .mixins import TagTestMixin class TagEventsTestCase(TagTestMixin, GenericDocumentViewTestCase): - def test_tag_create_event_no_permissions(self): + def setUp(self): + super(TagEventsTestCase, self).setUp() self.login_user() + def test_tag_create_event_no_permissions(self): Action.objects.all().delete() response = self._request_tag_create_view() @@ -22,8 +24,6 @@ class TagEventsTestCase(TagTestMixin, GenericDocumentViewTestCase): self.assertEqual(Action.objects.count(), 0) def test_tag_create_event_with_permissions(self): - self.login_user() - Action.objects.all().delete() self.grant_permission(permission=permission_tag_create) @@ -43,8 +43,6 @@ class TagEventsTestCase(TagTestMixin, GenericDocumentViewTestCase): def test_tag_edit_event_no_permissions(self): self._create_tag() - self.login_user() - Action.objects.all().delete() response = self._request_tag_edit_view() @@ -54,8 +52,6 @@ class TagEventsTestCase(TagTestMixin, GenericDocumentViewTestCase): def test_tag_edit_event_with_access(self): self._create_tag() - self.login_user() - Action.objects.all().delete() self.grant_access( diff --git a/mayan/apps/tags/tests/test_views.py b/mayan/apps/tags/tests/test_views.py index 0c4d65c5a0..f3c2a97a39 100644 --- a/mayan/apps/tags/tests/test_views.py +++ b/mayan/apps/tags/tests/test_views.py @@ -16,6 +16,10 @@ from .literals import ( class TagViewTestCase(GenericDocumentViewTestCase): + def setUp(self): + super(TagViewTestCase, self).setUp() + self.login_user() + def _create_tag(self): self.tag = Tag.objects.create( color=TEST_TAG_COLOR, label=TEST_TAG_LABEL @@ -30,17 +34,14 @@ class TagViewTestCase(GenericDocumentViewTestCase): ) def test_tag_create_view_no_permissions(self): - self.login_user() - response = self._request_create_tag_view() self.assertEqual(response.status_code, 403) self.assertEqual(Tag.objects.count(), 0) def test_tag_create_view_with_permissions(self): - self.login_user() - self.grant_permission(permission=permission_tag_create) + response = self._request_create_tag_view() self.assertEqual(response.status_code, 302) @@ -55,15 +56,14 @@ class TagViewTestCase(GenericDocumentViewTestCase): ) def test_tag_delete_view_no_permissions(self): - self.login_user() self._create_tag() response = self._request_delete_tag_view() self.assertEqual(response.status_code, 302) + self.assertEqual(Tag.objects.count(), 1) def test_tag_delete_view_with_access(self): - self.login_user() self._create_tag() self.grant_access(obj=self.tag, permission=permission_tag_delete) @@ -80,15 +80,14 @@ class TagViewTestCase(GenericDocumentViewTestCase): ) def test_tag_multiple_delete_view_no_permissions(self): - self.login_user() self._create_tag() response = self._request_multiple_delete_view() self.assertEqual(response.status_code, 302) + self.assertEqual(Tag.objects.count(), 1) def test_tag_multiple_delete_view_with_access(self): - self.login_user() self._create_tag() self.grant_access(obj=self.tag, permission=permission_tag_delete) @@ -106,23 +105,23 @@ class TagViewTestCase(GenericDocumentViewTestCase): ) def test_tag_edit_view_no_permissions(self): - self.login_user() self._create_tag() response = self._request_edit_tag_view() self.assertEqual(response.status_code, 403) + tag = Tag.objects.get(pk=self.tag.pk) self.assertEqual(tag.label, TEST_TAG_LABEL) self.assertEqual(tag.color, TEST_TAG_COLOR) def test_tag_edit_view_with_access(self): - self.login_user() self._create_tag() self.grant_access(obj=self.tag, permission=permission_tag_edit) response = self._request_edit_tag_view() self.assertEqual(response.status_code, 302) + tag = Tag.objects.get(pk=self.tag.pk) self.assertEqual(tag.label, TEST_TAG_LABEL_EDITED) self.assertEqual(tag.color, TEST_TAG_COLOR_EDITED) @@ -131,7 +130,6 @@ class TagViewTestCase(GenericDocumentViewTestCase): return self.get(viewname='documents:document_list') def test_document_tags_widget_no_permissions(self): - self.login_user() self._create_tag() self.tag.documents.add(self.document) @@ -141,7 +139,6 @@ class TagViewTestCase(GenericDocumentViewTestCase): ) def test_document_tags_widget_with_access(self): - self.login_user() self._create_tag() self.tag.documents.add(self.document) @@ -165,7 +162,6 @@ class TagViewTestCase(GenericDocumentViewTestCase): ) def test_document_attach_tag_view_no_permission(self): - self.login_user() self._create_tag() self.assertEqual(self.document.tags.count(), 0) @@ -179,7 +175,6 @@ class TagViewTestCase(GenericDocumentViewTestCase): self.assertEqual(self.document.tags.count(), 0) def test_document_attach_tag_view_with_access(self): - self.login_user() self._create_tag() self.assertEqual(self.document.tags.count(), 0) @@ -206,17 +201,16 @@ class TagViewTestCase(GenericDocumentViewTestCase): ) def test_document_multiple_attach_tag_view_no_permission(self): - self.login_user() self._create_tag() self.grant_permission(permission=permission_tag_view) response = self._request_multiple_attach_tag_view() self.assertEqual(response.status_code, 200) + self.assertEqual(self.document.tags.count(), 0) def test_document_multiple_attach_tag_view_with_access(self): - self.login_user() self._create_tag() self.grant_access(obj=self.document, permission=permission_tag_attach) @@ -243,7 +237,6 @@ class TagViewTestCase(GenericDocumentViewTestCase): ) def test_single_document_multiple_tag_remove_view_no_permissions(self): - self.login_user() self._create_tag() self.document.tags.add(self.tag) @@ -256,7 +249,6 @@ class TagViewTestCase(GenericDocumentViewTestCase): self.assertQuerysetEqual(self.document.tags.all(), (repr(self.tag),)) def test_single_document_multiple_tag_remove_view_with_access(self): - self.login_user() self._create_tag() self.document.tags.add(self.tag) @@ -280,7 +272,6 @@ class TagViewTestCase(GenericDocumentViewTestCase): ) def test_multiple_documents_selection_tag_remove_view_no_permissions(self): - self.login_user() self._create_tag() self.document.tags.add(self.tag) @@ -293,7 +284,6 @@ class TagViewTestCase(GenericDocumentViewTestCase): self.assertQuerysetEqual(self.document.tags.all(), (repr(self.tag),)) def test_multiple_documents_selection_tag_remove_view_with_access(self): - self.login_user() self._create_tag() self.document.tags.add(self.tag) diff --git a/mayan/apps/task_manager/tests/test_views.py b/mayan/apps/task_manager/tests/test_views.py index 15c599344d..6d2f35458b 100644 --- a/mayan/apps/task_manager/tests/test_views.py +++ b/mayan/apps/task_manager/tests/test_views.py @@ -14,6 +14,7 @@ class TaskManagerViewTestCase(GenericViewTestCase): self.test_queue = CeleryQueue( label=TEST_QUEUE_LABEL, name=TEST_QUEUE_NAME ) + self.login_user() def _request_active_task_list(self): return self.get( @@ -39,15 +40,11 @@ class TaskManagerViewTestCase(GenericViewTestCase): ) def test_queue_list_view_no_permissions(self): - self.login_user() - response = self._request_queue_list() self.assertEqual(response.status_code, 403) def test_queue_list_view_with_permissions(self): - self.login_user() - self.grant_permission(permission=permission_task_view) response = self._request_queue_list() @@ -57,15 +54,11 @@ class TaskManagerViewTestCase(GenericViewTestCase): ) def test_active_task_list_view_no_permissions(self): - self.login_user() - response = self._request_active_task_list() self.assertEqual(response.status_code, 403) def test_active_task_list_view_with_permissions(self): - self.login_user() - self.grant_permission(permission=permission_task_view) response = self._request_active_task_list() @@ -73,15 +66,11 @@ class TaskManagerViewTestCase(GenericViewTestCase): self.assertEqual(response.status_code, 200) def test_reserved_task_list_view_no_permissions(self): - self.login_user() - response = self._request_reserved_task_list() self.assertEqual(response.status_code, 403) def test_reserved_task_list_view_with_permissions(self): - self.login_user() - self.grant_permission(permission=permission_task_view) response = self._request_reserved_task_list() @@ -89,15 +78,11 @@ class TaskManagerViewTestCase(GenericViewTestCase): self.assertEqual(response.status_code, 200) def test_scheduled_task_list_view_no_permissions(self): - self.login_user() - response = self._request_scheduled_task_list() self.assertEqual(response.status_code, 403) def test_scheduled_task_list_view_with_permissions(self): - self.login_user() - self.grant_permission(permission=permission_task_view) response = self._request_scheduled_task_list()