diff --git a/mayan/apps/common/tests/mixins.py b/mayan/apps/common/tests/mixins.py index e7f3f4604f..c0246f56bb 100644 --- a/mayan/apps/common/tests/mixins.py +++ b/mayan/apps/common/tests/mixins.py @@ -130,22 +130,27 @@ class TempfileCheckMixin(object): class UserMixin(object): + auto_create_group = True + auto_create_users = True + def setUp(self): super(UserMixin, self).setUp() - self.admin_user = get_user_model().objects.create_superuser( - username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL, - password=TEST_ADMIN_PASSWORD - ) + if self.auto_create_users: + self.admin_user = get_user_model().objects.create_superuser( + username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL, + password=TEST_ADMIN_PASSWORD + ) - self.user = get_user_model().objects.create_user( - username=TEST_USER_USERNAME, email=TEST_USER_EMAIL, - password=TEST_USER_PASSWORD - ) + self.user = get_user_model().objects.create_user( + username=TEST_USER_USERNAME, email=TEST_USER_EMAIL, + password=TEST_USER_PASSWORD + ) - self.group = Group.objects.create(name=TEST_GROUP_NAME) - self.role = Role.objects.create(label=TEST_ROLE_LABEL) - self.group.user_set.add(self.user) - self.role.groups.add(self.group) + if self.auto_create_group: + self.group = Group.objects.create(name=TEST_GROUP_NAME) + self.role = Role.objects.create(label=TEST_ROLE_LABEL) + self.group.user_set.add(self.user) + self.role.groups.add(self.group) def grant_access(self, obj, permission): AccessControlList.objects.grant( diff --git a/mayan/apps/mailer/tests/test_views.py b/mayan/apps/mailer/tests/test_views.py index c7b22daed6..64b2153bdd 100644 --- a/mayan/apps/mailer/tests/test_views.py +++ b/mayan/apps/mailer/tests/test_views.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals from django.core import mail +from mayan.apps.common.tests import GenericViewTestCase from mayan.apps.documents.tests import GenericDocumentViewTestCase from ..models import UserMailer @@ -23,103 +24,37 @@ from .mailers import TestBackend from .mixins import MailerTestMixin -class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): - def _request_document_link_send(self): - return self.post( - 'mailer:send_document_link', args=(self.document.pk,), - data={ - 'email': getattr( - self, 'test_email_address', TEST_EMAIL_ADDRESS - ), - 'user_mailer': self.user_mailer.pk - }, - ) - - def _request_document_send(self): - return self.post( - 'mailer:send_document', args=(self.document.pk,), - data={ - 'email': getattr( - self, 'test_email_address', TEST_EMAIL_ADDRESS - ), - 'user_mailer': self.user_mailer.pk - }, - ) +class MailerViewsTestCase(MailerTestMixin, GenericViewTestCase): + def setUp(self): + super(MailerViewsTestCase, self).setUp() + self.login_user() def _request_user_mailer_create(self): return self.post( - 'mailer:user_mailer_create', args=( + viewname='mailer:user_mailer_create', args=( TEST_USER_MAILER_BACKEND_PATH, ), data={ - 'default': True, - 'enabled': True, + 'default': True, 'enabled': True, 'label': TEST_USER_MAILER_LABEL, - }, follow=True + } ) def _request_user_mailer_delete(self): return self.post( - 'mailer:user_mailer_delete', args=(self.user_mailer.pk,) + viewname='mailer:user_mailer_delete', args=(self.user_mailer.pk,) ) def _request_user_mailer_test(self): return self.post( - 'mailer:user_mailer_test', args=(self.user_mailer.pk,), data={ + viewname='mailer:user_mailer_test', args=(self.user_mailer.pk,), + data={ 'email': getattr( self, 'test_email_address', TEST_EMAIL_ADDRESS ) - }, follow=True + } ) - def test_mail_link_view_no_permissions(self): - self._create_user_mailer() - self.login_user() - - response = self._request_document_link_send() - - self.assertContains( - response, 'Select a valid choice', status_code=200 - ) - - 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) - - self._request_document_link_send() - - self.assertEqual(len(mail.outbox), 1) - self.assertEqual(mail.outbox[0].from_email, TEST_EMAIL_FROM_ADDRESS) - self.assertEqual(mail.outbox[0].to, [TEST_EMAIL_ADDRESS]) - - def test_mail_document_view_no_permissions(self): - self._create_user_mailer() - self.login_user() - - response = self._request_document_send() - self.assertContains( - response, 'Select a valid choice', status_code=200 - ) - - 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) - - self._request_document_send() - - self.assertEqual(len(mail.outbox), 1) - self.assertEqual(mail.outbox[0].from_email, TEST_EMAIL_FROM_ADDRESS) - 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() self.assertNotContains( @@ -128,21 +63,15 @@ 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) response = self._request_user_mailer_create() - self.assertContains( - response, text=TestBackend.label, status_code=200 - ) - + self.assertEqual(response.status_code, 302) self.assertEqual(UserMailer.objects.count(), 1) def test_user_mailer_delete_view_no_permissions(self): self._create_user_mailer() - self.login_user() self._request_user_mailer_delete() @@ -152,7 +81,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 @@ -162,26 +90,24 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): self.assertEqual(UserMailer.objects.count(), 0) + def _request_user_mailer_list_view(self): + return self.get(viewname='mailer:user_mailer_list') + def test_user_mailer_list_view_no_permissions(self): self._create_user_mailer() - self.login_user() - response = self.get( - 'mailer:user_mailer_list', - ) + response = self._request_user_mailer_list_view() self.assertNotContains( response, text=self.user_mailer.label, status_code=200 ) - def test_user_mailer_list_view_with_permissions(self): + def test_user_mailer_list_view_with_access(self): self._create_user_mailer() - self.login_user() - self.grant_permission(permission=permission_user_mailer_view) - - response = self.get( - 'mailer:user_mailer_list', + self.grant_access( + permission=permission_user_mailer_view, obj=self.user_mailer ) + response = self._request_user_mailer_list_view() self.assertContains( response, text=self.user_mailer.label, status_code=200 @@ -189,7 +115,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() @@ -199,7 +124,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 @@ -207,14 +131,13 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): response = self._request_user_mailer_test() - self.assertEqual(response.status_code, 200) + self.assertEqual(response.status_code, 302) self.assertEqual(len(mail.outbox), 1) self.assertEqual(mail.outbox[0].from_email, TEST_EMAIL_FROM_ADDRESS) self.assertEqual(mail.outbox[0].to, [TEST_EMAIL_ADDRESS]) 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 @@ -222,7 +145,7 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): self.test_email_address = TEST_RECIPIENTS_MULTIPLE_COMMA response = self._request_user_mailer_test() - self.assertEqual(response.status_code, 200) + self.assertEqual(response.status_code, 302) self.assertEqual(len(mail.outbox), 1) self.assertEqual(mail.outbox[0].from_email, TEST_EMAIL_FROM_ADDRESS) self.assertEqual( @@ -231,7 +154,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 @@ -239,7 +161,7 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): self.test_email_address = TEST_RECIPIENTS_MULTIPLE_MIXED response = self._request_user_mailer_test() - self.assertEqual(response.status_code, 200) + self.assertEqual(response.status_code, 302) self.assertEqual(len(mail.outbox), 1) self.assertEqual(mail.outbox[0].from_email, TEST_EMAIL_FROM_ADDRESS) self.assertEqual( @@ -248,7 +170,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 @@ -256,16 +177,165 @@ class MailerViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): self.test_email_address = TEST_RECIPIENTS_MULTIPLE_SEMICOLON response = self._request_user_mailer_test() - self.assertEqual(response.status_code, 200) + self.assertEqual(response.status_code, 302) self.assertEqual(len(mail.outbox), 1) self.assertEqual(mail.outbox[0].from_email, TEST_EMAIL_FROM_ADDRESS) self.assertEqual( mail.outbox[0].to, TEST_RECIPIENTS_MULTIPLE_SEMICOLON_RESULT ) + +class DocumentViewsTestCase(MailerTestMixin, GenericDocumentViewTestCase): + def setUp(self): + super(DocumentViewsTestCase, self).setUp() + self.login_user() + + def _request_document_link_send(self): + return self.post( + viewname='mailer:document_send_link', args=(self.document.pk,), + data={ + 'email': getattr( + self, 'test_email_address', TEST_EMAIL_ADDRESS + ), + 'user_mailer': self.user_mailer.pk + } + ) + + def _request_document_send(self): + return self.post( + viewname='mailer:document_send', args=(self.document.pk,), + data={ + 'email': getattr( + self, 'test_email_address', TEST_EMAIL_ADDRESS + ), 'user_mailer': self.user_mailer.pk + } + ) + + def test_mail_link_view_no_permissions(self): + self._create_user_mailer() + + response = self._request_document_link_send() + + self.assertNotContains( + response=response, text=self.user_mailer.label, status_code=200 + ) + self.assertNotContains( + response=response, text=self.document.label, status_code=200 + ) + self.assertEqual(len(mail.outbox), 0) + + def test_mail_link_view_with_document_access(self): + self._create_user_mailer() + + self.grant_access( + permission=permission_mailing_link, obj=self.document + ) + + response = self._request_document_link_send() + self.assertNotContains( + response=response, text=self.user_mailer.label, status_code=200 + ) + self.assertContains( + response=response, text=self.document.label, status_code=200 + ) + self.assertEqual(len(mail.outbox), 0) + + def test_mail_link_view_with_mailer_access(self): + self._create_user_mailer() + + self.grant_access( + permission=permission_user_mailer_use, obj=self.user_mailer + ) + + response = self._request_document_link_send() + self.assertNotContains( + response=response, text=self.user_mailer.label, status_code=302 + ) + self.assertNotContains( + response=response, text=self.document.label, status_code=302 + ) + + self.assertEqual(len(mail.outbox), 0) + + def test_mail_link_view_with_full_access(self): + self._create_user_mailer() + + self.grant_access( + permission=permission_mailing_link, obj=self.document + ) + self.grant_access( + permission=permission_user_mailer_use, obj=self.user_mailer + ) + + self._request_document_link_send() + + self.assertEqual(len(mail.outbox), 1) + self.assertEqual(mail.outbox[0].from_email, TEST_EMAIL_FROM_ADDRESS) + self.assertEqual(mail.outbox[0].to, [TEST_EMAIL_ADDRESS]) + + def test_mail_document_view_no_permissions(self): + self._create_user_mailer() + + response = self._request_document_send() + self.assertNotContains( + response=response, text=self.user_mailer.label, status_code=200 + ) + self.assertNotContains( + response=response, text=self.document.label, status_code=200 + ) + self.assertEqual(len(mail.outbox), 0) + + + def test_mail_document_view_with_document_access(self): + self._create_user_mailer() + + self.grant_access( + permission=permission_mailing_send_document, obj=self.document + ) + + response = self._request_document_send() + self.assertNotContains( + response=response, text=self.user_mailer.label, status_code=200 + ) + self.assertContains( + response=response, text=self.document.label, status_code=200 + ) + + self.assertEqual(len(mail.outbox), 0) + + def test_mail_document_view_with_mailer_access(self): + self._create_user_mailer() + + self.grant_access( + permission=permission_user_mailer_use, obj=self.user_mailer + ) + + response = self._request_document_send() + self.assertNotContains( + response=response, text=self.document.label, status_code=302 + ) + + self.assertEqual(len(mail.outbox), 0) + + def test_mail_document_view_with_full_access(self): + self._create_user_mailer() + + self.grant_access( + permission=permission_user_mailer_use, obj=self.user_mailer + ) + self.grant_access( + permission=permission_mailing_send_document, obj=self.document + ) + + response = self._request_document_send() + + self.assertEqual(len(mail.outbox), 1) + self.assertEqual(mail.outbox[0].from_email, TEST_EMAIL_FROM_ADDRESS) + self.assertEqual(mail.outbox[0].to, [TEST_EMAIL_ADDRESS]) + + 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) @@ -281,7 +351,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) @@ -297,7 +366,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) @@ -313,7 +381,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) @@ -329,7 +396,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) @@ -345,7 +411,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/ocr/tests/test_views.py b/mayan/apps/ocr/tests/test_views.py index 51c4cd0a09..b52ec3a695 100644 --- a/mayan/apps/ocr/tests/test_views.py +++ b/mayan/apps/ocr/tests/test_views.py @@ -21,7 +21,8 @@ class OCRViewsTestCase(GenericDocumentViewTestCase): def _request_document_content_view(self): return self.get( - viewname='ocr:document_ocr_content', args=(self.document.pk,) + viewname='ocr:document_content', + kwargs={'pk': self.document.pk} ) def test_document_content_view_no_permissions(self): @@ -44,9 +45,8 @@ class OCRViewsTestCase(GenericDocumentViewTestCase): def _request_document_page_content_view(self): return self.get( - viewname='ocr:document_page_ocr_content', args=( - self.document.pages.first().pk, - ) + viewname='ocr:document_page_content', + kwargs={'pk': self.document.pages.first().pk} ) def test_document_page_content_view_no_permissions(self): @@ -69,7 +69,8 @@ class OCRViewsTestCase(GenericDocumentViewTestCase): def _request_document_submit_view(self): return self.post( - viewname='ocr:document_submit', args=(self.document.pk,) + viewname='ocr:document_submit', + kwargs={'pk': self.document.pk} ) def test_document_submit_view_no_permission(self): @@ -87,7 +88,7 @@ class OCRViewsTestCase(GenericDocumentViewTestCase): def _request_multiple_document_submit_view(self): return self.post( - viewname='ocr:document_submit_multiple', + viewname='ocr:document_multiple_submit', data={ 'id_list': self.document.pk, } @@ -108,7 +109,8 @@ class OCRViewsTestCase(GenericDocumentViewTestCase): def _request_document_ocr_download_view(self): return self.get( - viewname='ocr:document_ocr_download', args=(self.document.pk,) + viewname='ocr:document_download', + kwargs={'pk': self.document.pk} ) def test_document_ocr_download_view_no_permission(self): @@ -141,8 +143,8 @@ class DocumentTypeViewsTestCase(GenericDocumentViewTestCase): def _request_document_type_ocr_settings_view(self): return self.get( - viewname='ocr:document_type_ocr_settings', - args=(self.document.document_type.pk,) + viewname='ocr:document_type_settings', + kwargs={'pk': self.document.document_type.pk} ) def test_document_type_ocr_settings_view_no_permission(self): diff --git a/mayan/apps/ocr/urls.py b/mayan/apps/ocr/urls.py index 760fb2a10e..857bb64bde 100644 --- a/mayan/apps/ocr/urls.py +++ b/mayan/apps/ocr/urls.py @@ -44,7 +44,7 @@ urlpatterns = [ url( r'^document_types/(?P\d+)/ocr/settings/$', DocumentTypeSettingsEditView.as_view(), - name='document_type_ocr_settings' + name='document_type_settings' ), url(r'^errors/$', EntryListView.as_view(), name='entry_list'), ] diff --git a/mayan/apps/user_management/events.py b/mayan/apps/user_management/events.py index 52f8e75fa7..571e1427aa 100644 --- a/mayan/apps/user_management/events.py +++ b/mayan/apps/user_management/events.py @@ -9,15 +9,15 @@ namespace = EventTypeNamespace( ) event_group_created = namespace.add_event_type( - label=_('Group created'), name='created' + label=_('Group created'), name='group_created' ) event_group_edited = namespace.add_event_type( - label=_('Group edited'), name='edited' + label=_('Group edited'), name='group_edited' ) event_user_created = namespace.add_event_type( - label=_('User created'), name='created' + label=_('User created'), name='user_created' ) event_user_edited = namespace.add_event_type( - label=_('User edited'), name='edited' + label=_('User edited'), name='user_edited' ) diff --git a/mayan/apps/user_management/tests/mixins.py b/mayan/apps/user_management/tests/mixins.py index ed3c0cd77b..77ff3726c9 100644 --- a/mayan/apps/user_management/tests/mixins.py +++ b/mayan/apps/user_management/tests/mixins.py @@ -1,20 +1,63 @@ from __future__ import unicode_literals from django.contrib.auth import get_user_model +from django.contrib.auth.models import Group from .literals import ( - TEST_USER_2_EMAIL, TEST_USER_2_PASSWORD, TEST_USER_2_USERNAME + TEST_GROUP_2_NAME, TEST_GROUP_2_NAME_EDITED, TEST_USER_2_EMAIL, + TEST_USER_2_PASSWORD, TEST_USER_2_USERNAME, TEST_USER_2_USERNAME_EDITED ) class UserTestMixin(object): - def _create_user(self): - return get_user_model().objects.create_user( + def _create_test_group(self): + self.test_group = Group.objects.create(name=TEST_GROUP_2_NAME) + + def _edit_test_group(self): + self.test_group.name = TEST_GROUP_2_NAME_EDITED + self.test_group.save() + + def _create_test_user(self): + self.test_user = get_user_model().objects.create( username=TEST_USER_2_USERNAME, email=TEST_USER_2_EMAIL, password=TEST_USER_2_PASSWORD ) - def _create_test_user_2(self): - self.user_2 = get_user_model().objects.create( - username=TEST_USER_2_USERNAME + def _request_test_group_create_view(self): + reponse = self.post( + viewname='user_management:group_create', data={ + 'name': TEST_GROUP_2_NAME + } + ) + self.test_group = Group.objects.filter(name=TEST_GROUP_2_NAME).first() + return reponse + + def _request_test_group_edit_view(self): + return self.post( + viewname='user_management:group_edit', kwargs={ + 'pk': self.test_group.pk + }, data={ + 'name': TEST_GROUP_2_NAME_EDITED + } + ) + + def _request_test_user_create_view(self): + reponse = self.post( + viewname='user_management:user_create', data={ + 'username': TEST_USER_2_USERNAME + } + ) + + self.test_user = get_user_model().objects.filter( + username=TEST_USER_2_USERNAME + ).first() + return reponse + + def _request_test_user_edit_view(self): + return self.post( + viewname='user_management:user_edit', kwargs={ + 'pk': self.test_user.pk + }, data={ + 'username': TEST_USER_2_USERNAME_EDITED + } ) diff --git a/mayan/apps/user_management/tests/test_api.py b/mayan/apps/user_management/tests/test_api.py index b69232fc07..e1cb7cc181 100644 --- a/mayan/apps/user_management/tests/test_api.py +++ b/mayan/apps/user_management/tests/test_api.py @@ -27,8 +27,7 @@ class UserManagementUserAPITestCase(UserTestMixin, BaseAPITestCase): super(UserManagementUserAPITestCase, self).setUp() self.login_user() - # User create - def _request_user_create(self): + def _request_api_test_user_create(self): return self.post( viewname='rest_api:user-list', data={ 'email': TEST_USER_2_EMAIL, 'password': TEST_USER_2_PASSWORD, @@ -37,61 +36,61 @@ class UserManagementUserAPITestCase(UserTestMixin, BaseAPITestCase): ) def test_user_create_no_permission(self): - response = self._request_user_create() + response = self._request_api_test_user_create() self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) # Default two users, the test admin and the test user self.assertEqual(get_user_model().objects.count(), 2) def test_user_create_with_permission(self): self.grant_permission(permission=permission_user_create) - response = self._request_user_create() + response = self._request_api_test_user_create() self.assertEqual(response.status_code, status.HTTP_201_CREATED) user = get_user_model().objects.get(pk=response.data['id']) self.assertEqual(user.username, TEST_USER_2_USERNAME) self.assertEqual(get_user_model().objects.count(), 3) - def _request_create_user_with_extra_data(self): + def _request_api_create_test_user_with_extra_data(self): return self.post( viewname='rest_api:user-list', data={ 'email': TEST_USER_2_EMAIL, 'password': TEST_USER_2_PASSWORD, 'username': TEST_USER_2_USERNAME, - 'groups_pk_list': self.groups_pk_list + 'groups_pk_list': self.test_groups_pk_list } ) def test_user_create_with_group_no_permission(self): - group_1 = Group.objects.create(name=TEST_GROUP_2_NAME) - self.groups_pk_list = '{}'.format(group_1.pk) + self._create_test_group() + self.test_groups_pk_list = '{}'.format(self.test_group.pk) - response = self._request_create_user_with_extra_data() + response = self._request_api_create_test_user_with_extra_data() self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) def test_user_create_with_group_with_permission(self): - group_1 = Group.objects.create(name=TEST_GROUP_2_NAME) - self.groups_pk_list = '{}'.format(group_1.pk) + self._create_test_group() + self.test_groups_pk_list = '{}'.format(self.test_group.pk) self.grant_permission(permission=permission_user_create) - response = self._request_create_user_with_extra_data() + response = self._request_api_create_test_user_with_extra_data() self.assertEqual(response.status_code, status.HTTP_201_CREATED) user = get_user_model().objects.get(pk=response.data['id']) self.assertEqual(user.username, TEST_USER_2_USERNAME) - self.assertQuerysetEqual(user.groups.all(), (repr(group_1),)) + self.assertQuerysetEqual(user.groups.all(), (repr(self.test_group),)) def test_user_create_with_groups_no_permission(self): group_1 = Group.objects.create(name='test group 1') group_2 = Group.objects.create(name='test group 2') - self.groups_pk_list = '{},{}'.format(group_1.pk, group_2.pk) - response = self._request_create_user_with_extra_data() + self.test_groups_pk_list = '{},{}'.format(group_1.pk, group_2.pk) + response = self._request_api_create_test_user_with_extra_data() self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) def test_user_create_with_groups_with_permission(self): group_1 = Group.objects.create(name='test group 1') group_2 = Group.objects.create(name='test group 2') - self.groups_pk_list = '{},{}'.format(group_1.pk, group_2.pk) + self.test_groups_pk_list = '{},{}'.format(group_1.pk, group_2.pk) self.grant_permission(permission=permission_user_create) - response = self._request_create_user_with_extra_data() + response = self._request_api_create_test_user_with_extra_data() self.assertEqual(response.status_code, status.HTTP_201_CREATED) @@ -104,7 +103,11 @@ class UserManagementUserAPITestCase(UserTestMixin, BaseAPITestCase): # User login def test_user_create_login(self): - self._create_user() + self._create_test_user() + + self.login( + username=TEST_USER_2_USERNAME, password=TEST_USER_2_PASSWORD + ) self.assertTrue( self.login( @@ -115,242 +118,253 @@ class UserManagementUserAPITestCase(UserTestMixin, BaseAPITestCase): # User password change def test_user_create_login_password_change_no_access(self): - user = self._create_user() + self._create_test_user() self.patch( - viewname='rest_api:user-detail', args=(user.pk,), data={ + viewname='rest_api:user-detail', args=(self.test_user.pk,), data={ 'password': TEST_USER_2_PASSWORD_EDITED, } ) self.assertFalse( self.client.login( - username=TEST_USER_2_USERNAME, password=TEST_USER_2_PASSWORD_EDITED + username=TEST_USER_2_USERNAME, + password=TEST_USER_2_PASSWORD_EDITED ) ) def test_user_create_login_password_change_with_access(self): - user = self._create_user() + self._create_test_user() - self.grant_access(permission=permission_user_edit, obj=user) + self.grant_access(permission=permission_user_edit, obj=self.test_user) self.patch( - viewname='rest_api:user-detail', args=(user.pk,), data={ + viewname='rest_api:user-detail', args=(self.test_user.pk,), data={ 'password': TEST_USER_2_PASSWORD_EDITED, } ) self.assertTrue( self.client.login( - username=TEST_USER_2_USERNAME, password=TEST_USER_2_PASSWORD_EDITED + username=TEST_USER_2_USERNAME, + password=TEST_USER_2_PASSWORD_EDITED ) ) # User edit - def _request_user_edit_via_put(self, user): + def _request_api_test_user_edit_via_put(self): return self.put( - viewname='rest_api:user-detail', args=(user.pk,), + viewname='rest_api:user-detail', args=(self.test_user.pk,), data={'username': TEST_USER_2_USERNAME_EDITED} ) def test_user_edit_via_put_no_access(self): - user = self._create_user() - response = self._request_user_edit_via_put(user=user) + self._create_test_user() + response = self._request_api_test_user_edit_via_put() self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) - user.refresh_from_db() - self.assertEqual(user.username, TEST_USER_2_USERNAME) + self.test_user.refresh_from_db() + self.assertEqual(self.test_user.username, TEST_USER_2_USERNAME) def test_user_edit_via_put_with_access(self): - user = self._create_user() - self.grant_access(permission=permission_user_edit, obj=user) - response = self._request_user_edit_via_put(user=user) + self._create_test_user() + self.grant_access(permission=permission_user_edit, obj=self.test_user) + response = self._request_api_test_user_edit_via_put() self.assertEqual(response.status_code, status.HTTP_200_OK) - user.refresh_from_db() - self.assertEqual(user.username, TEST_USER_2_USERNAME_EDITED) + self.test_user.refresh_from_db() + self.assertEqual(self.test_user.username, TEST_USER_2_USERNAME_EDITED) - def _request_user_edit_via_patch(self, user): + def _request_api_test_user_edit_via_patch(self): return self.patch( - viewname='rest_api:user-detail', args=(user.pk,), + viewname='rest_api:user-detail', args=(self.test_user.pk,), data={'username': TEST_USER_2_USERNAME_EDITED} ) def test_user_edit_via_patch_no_access(self): - user = self._create_user() - response = self._request_user_edit_via_patch(user=user) + self._create_test_user() + response = self._request_api_test_user_edit_via_patch() self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) - user.refresh_from_db() - self.assertEqual(user.username, TEST_USER_2_USERNAME) + self.test_user.refresh_from_db() + self.assertEqual(self.test_user.username, TEST_USER_2_USERNAME) def test_user_edit_via_patch_with_access(self): - user = self._create_user() - self.grant_access(permission=permission_user_edit, obj=user) - response = self._request_user_edit_via_patch(user=user) + self._create_test_user() + self.grant_access(permission=permission_user_edit, obj=self.test_user) + response = self._request_api_test_user_edit_via_patch() self.assertEqual(response.status_code, status.HTTP_200_OK) - user.refresh_from_db() - self.assertEqual(user.username, TEST_USER_2_USERNAME_EDITED) + self.test_user.refresh_from_db() + self.assertEqual(self.test_user.username, TEST_USER_2_USERNAME_EDITED) - def _request_user_edit_via_patch_with_extra_data(self, user, group): + def _request_api_test_user_edit_via_patch_with_extra_data(self): return self.patch( - viewname='rest_api:user-detail', args=(user.pk,), - data={'groups_pk_list': '{}'.format(group.pk)} + viewname='rest_api:user-detail', args=(self.test_user.pk,), + data={'groups_pk_list': '{}'.format(self.test_group.pk)} ) def test_user_edit_add_groups_via_patch_no_access(self): - group = Group.objects.create(name=TEST_GROUP_2_NAME) - user = self._create_user() + self._create_test_group() + self._create_test_user() - response = self._request_user_edit_via_patch_with_extra_data( - user=user, group=group - ) + response = self._request_api_test_user_edit_via_patch_with_extra_data() self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) - user.refresh_from_db() - self.assertEqual(user.username, TEST_USER_2_USERNAME) + self.test_user.refresh_from_db() + self.assertEqual(self.test_user.username, TEST_USER_2_USERNAME) self.assertQuerysetEqual( - user.groups.all(), () + self.test_user.groups.all(), () ) def test_user_edit_add_groups_via_patch_with_access(self): - group = Group.objects.create(name=TEST_GROUP_2_NAME) - user = self._create_user() - self.grant_access(permission=permission_user_edit, obj=user) - response = self._request_user_edit_via_patch_with_extra_data( - user=user, group=group - ) + self._create_test_group() + self._create_test_user() + self.grant_access(permission=permission_user_edit, obj=self.test_user) + response = self._request_api_test_user_edit_via_patch_with_extra_data() self.assertEqual(response.status_code, status.HTTP_200_OK) - user.refresh_from_db() - self.assertEqual(user.username, TEST_USER_2_USERNAME) + self.test_user.refresh_from_db() + self.assertEqual(self.test_user.username, TEST_USER_2_USERNAME) self.assertQuerysetEqual( - user.groups.all(), (repr(group),) + self.test_user.groups.all(), (repr(self.test_group),) ) # User delete - def _request_user_delete(self, user): + def _request_api_test_user_delete(self): return self.delete( - viewname='rest_api:user-detail', args=(user.pk,) + viewname='rest_api:user-detail', args=(self.test_user.pk,) ) def test_user_delete_no_access(self): - user = self._create_user() - response = self._request_user_delete(user=user) + self._create_test_user() + response = self._request_api_test_user_delete() self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) - self.assertTrue(get_user_model().objects.filter(pk=user.pk).exists()) + self.assertTrue( + get_user_model().objects.filter(pk=self.test_user.pk).exists() + ) def test_user_delete_with_access(self): - user = self._create_user() - self.grant_access(permission=permission_user_delete, obj=user) - response = self._request_user_delete(user=user) + self._create_test_user() + self.grant_access( + permission=permission_user_delete, obj=self.test_user + ) + response = self._request_api_test_user_delete() self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) - self.assertFalse(get_user_model().objects.filter(pk=user.pk).exists()) + self.assertFalse( + get_user_model().objects.filter(pk=self.test_user.pk).exists() + ) # User view - def _request_user_group_view(self, user): + def _request_api_test_user_group_view(self): return self.get( - viewname='rest_api:users-group-list', args=(user.pk,) + viewname='rest_api:users-group-list', args=(self.test_user.pk,) ) def test_user_group_list_no_access(self): group = Group.objects.create(name=TEST_GROUP_2_NAME) - user = self._create_user() - user.groups.add(group) - response = self._request_user_group_view(user=user) + self._create_test_user() + self.test_user.groups.add(group) + response = self._request_api_test_user_group_view() self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) def test_user_group_list_with_user_access(self): group = Group.objects.create(name=TEST_GROUP_2_NAME) - user = self._create_user() - user.groups.add(group) - self.grant_access(permission=permission_user_view, obj=user) - response = self._request_user_group_view(user=user) + self._create_test_user() + self.test_user.groups.add(group) + self.grant_access(permission=permission_user_view, obj=self.test_user) + response = self._request_api_test_user_group_view() self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.data['count'], 0) def test_user_group_list_with_group_access(self): - group = Group.objects.create(name=TEST_GROUP_2_NAME) - user = self._create_user() - user.groups.add(group) - self.grant_access(permission=permission_group_view, obj=group) - response = self._request_user_group_view(user=user) + self._create_test_group() + self._create_test_user() + self.test_user.groups.add(self.test_group) + self.grant_access( + permission=permission_group_view, obj=self.test_group + ) + response = self._request_api_test_user_group_view() self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) def test_user_group_list_with_access(self): - group = Group.objects.create(name=TEST_GROUP_2_NAME) - user = self._create_user() - user.groups.add(group) - self.grant_access(permission=permission_user_view, obj=user) - self.grant_access(permission=permission_group_view, obj=group) - response = self._request_user_group_view(user=user) + self._create_test_group() + self._create_test_user() + self.test_user.groups.add(self.test_group) + self.grant_access(permission=permission_user_view, obj=self.test_user) + self.grant_access( + permission=permission_group_view, obj=self.test_group + ) + response = self._request_api_test_user_group_view() self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.data['count'], 1) - def _request_user_group_add(self, user, group): + def _request_api_test_user_group_add(self): return self.post( - viewname='rest_api:users-group-list', args=(user.pk,), data={ - 'group_pk_list': '{}'.format(group.pk) - } + viewname='rest_api:users-group-list', args=(self.test_user.pk,), + data={'group_pk_list': '{}'.format(self.test_group.pk)} ) def test_user_group_add_no_access(self): - group = Group.objects.create(name=TEST_GROUP_2_NAME) - user = self._create_user() - response = self._request_user_group_add(user=user, group=group) + self._create_test_group() + self._create_test_user() + response = self._request_api_test_user_group_add() self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) - user.refresh_from_db() - self.assertEqual(group.user_set.first(), None) + self.test_user.refresh_from_db() + self.assertEqual(self.test_group.user_set.first(), None) def test_user_group_add_with_user_access(self): - group = Group.objects.create(name=TEST_GROUP_2_NAME) - user = self._create_user() - self.grant_access(permission=permission_user_edit, obj=user) - response = self._request_user_group_add(user=user, group=group) + self._create_test_group() + self._create_test_user() + self.grant_access(permission=permission_user_edit, obj=self.test_user) + response = self._request_api_test_user_group_add() self.assertEqual(response.status_code, status.HTTP_201_CREATED) # FIXME: Should this endpoint return a 201 or a 200 since # the user is being edited and there is not resource creation # happening. - user.refresh_from_db() - self.assertEqual(group.user_set.first(), None) + self.test_user.refresh_from_db() + self.assertEqual(self.test_group.user_set.first(), None) def test_user_group_add_with_group_access(self): - group = Group.objects.create(name=TEST_GROUP_2_NAME) - user = self._create_user() - self.grant_access(permission=permission_group_view, obj=group) - response = self._request_user_group_add(user=user, group=group) + self._create_test_group() + self._create_test_user() + self.grant_access( + permission=permission_group_view, obj=self.test_group + ) + response = self._request_api_test_user_group_add() self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) # FIXME: Should this endpoint return a 201 or a 200 since # the user is being edited and there is not resource creation # happening. - user.refresh_from_db() - self.assertEqual(group.user_set.first(), None) + self.test_user.refresh_from_db() + self.assertEqual(self.test_group.user_set.first(), None) def test_user_group_add_with_access(self): - group = Group.objects.create(name=TEST_GROUP_2_NAME) - user = self._create_user() - self.grant_access(permission=permission_user_edit, obj=user) - self.grant_access(permission=permission_group_view, obj=group) - response = self._request_user_group_add(user=user, group=group) + self._create_test_group() + self._create_test_user() + self.grant_access(permission=permission_user_edit, obj=self.test_user) + self.grant_access( + permission=permission_group_view, obj=self.test_group + ) + response = self._request_api_test_user_group_add() self.assertEqual(response.status_code, status.HTTP_201_CREATED) # FIXME: Should this endpoint return a 201 or a 200 since # the user is being edited and there is not resource creation # happening. - user.refresh_from_db() - self.assertEqual(group.user_set.first(), user) + self.test_user.refresh_from_db() + self.assertEqual(self.test_group.user_set.first(), self.test_user) class UserManagementGroupAPITestCase(BaseAPITestCase): @@ -358,7 +372,7 @@ class UserManagementGroupAPITestCase(BaseAPITestCase): super(UserManagementGroupAPITestCase, self).setUp() self.login_user() - def _request_group_create(self): + def _request_api_test_group_create(self): return self.post( viewname='rest_api:group-list', data={ 'name': TEST_GROUP_2_NAME @@ -366,65 +380,75 @@ class UserManagementGroupAPITestCase(BaseAPITestCase): ) def test_group_create_no_permission(self): - response = self._request_group_create() + response = self._request_api_test_group_create() self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) self.assertFalse( - TEST_GROUP_2_NAME in list(Group.objects.values_list('name', flat=True)) + TEST_GROUP_2_NAME in list( + Group.objects.values_list('name', flat=True) + ) ) def test_group_create_with_permission(self): self.grant_permission(permission=permission_group_create) - response = self._request_group_create() + response = self._request_api_test_group_create() self.assertEqual(response.status_code, status.HTTP_201_CREATED) self.assertTrue( - TEST_GROUP_2_NAME in list(Group.objects.values_list('name', flat=True)) + TEST_GROUP_2_NAME in list( + Group.objects.values_list('name', flat=True) + ) ) - def _request_group_edit_via_patch(self): + def _request_api_test_group_edit_via_patch(self): return self.patch( - viewname='rest_api:group-detail', args=(self.group.pk,), + viewname='rest_api:group-detail', args=(self.test_group.pk,), data={ 'name': TEST_GROUP_2_NAME_EDITED } ) def test_group_edit_via_patch_no_access(self): - self.group = Group.objects.create(name=TEST_GROUP_2_NAME) - response = self._request_group_edit_via_patch() + self.test_group = Group.objects.create(name=TEST_GROUP_2_NAME) + response = self._request_api_test_group_edit_via_patch() self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) - self.group.refresh_from_db() - self.assertEqual(self.group.name, TEST_GROUP_2_NAME) + self.test_group.refresh_from_db() + self.assertEqual(self.test_group.name, TEST_GROUP_2_NAME) def test_group_edit_via_patch_with_access(self): - self.group = Group.objects.create(name=TEST_GROUP_2_NAME) - self.grant_access(permission=permission_group_edit, obj=self.group) - response = self._request_group_edit_via_patch() + self.test_group = Group.objects.create(name=TEST_GROUP_2_NAME) + self.grant_access( + permission=permission_group_edit, obj=self.test_group + ) + response = self._request_api_test_group_edit_via_patch() self.assertEqual(response.status_code, status.HTTP_200_OK) - self.group.refresh_from_db() - self.assertEqual(self.group.name, TEST_GROUP_2_NAME_EDITED) + self.test_group.refresh_from_db() + self.assertEqual(self.test_group.name, TEST_GROUP_2_NAME_EDITED) - def _request_group_delete(self): + def _request_api_test_group_delete(self): return self.delete( - viewname='rest_api:group-detail', args=(self.group.pk,) + viewname='rest_api:group-detail', args=(self.test_group.pk,) ) def test_group_delete_no_access(self): - self.group = Group.objects.create(name=TEST_GROUP_2_NAME) - response = self._request_group_delete() + self.test_group = Group.objects.create(name=TEST_GROUP_2_NAME) + response = self._request_api_test_group_delete() self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) self.assertTrue( - TEST_GROUP_2_NAME in list(Group.objects.values_list('name', flat=True)) + TEST_GROUP_2_NAME in list( + Group.objects.values_list('name', flat=True) + ) ) def test_group_delete_with_access(self): - self.group = Group.objects.create(name=TEST_GROUP_2_NAME) - self.grant_access(permission=permission_group_delete, obj=self.group) - response = self._request_group_delete() + self.test_group = Group.objects.create(name=TEST_GROUP_2_NAME) + self.grant_access(permission=permission_group_delete, obj=self.test_group) + response = self._request_api_test_group_delete() self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) self.assertFalse( - TEST_GROUP_2_NAME in list(Group.objects.values_list('name', flat=True)) + TEST_GROUP_2_NAME in list( + Group.objects.values_list('name', flat=True) + ) ) diff --git a/mayan/apps/user_management/tests/test_events.py b/mayan/apps/user_management/tests/test_events.py new file mode 100644 index 0000000000..9e4e2c4c73 --- /dev/null +++ b/mayan/apps/user_management/tests/test_events.py @@ -0,0 +1,50 @@ +from __future__ import unicode_literals + +from actstream.models import Action + +from mayan.apps.common.tests import GenericViewTestCase + +from ..events import ( + event_group_created, event_group_edited, event_user_created, + event_user_edited +) + +from .mixins import UserTestMixin + + +class GroupEventsTestCase(UserTestMixin, GenericViewTestCase): + auto_create_group = False + + def test_group_create_event(self): + self.login_admin_user() + Action.objects.all().delete() + self._request_test_group_create_view() + self.assertEqual(Action.objects.last().target, self.test_group) + self.assertEqual(Action.objects.last().verb, event_group_created.id) + + def test_group_edit_event(self): + self.login_admin_user() + self._create_test_group() + Action.objects.all().delete() + self._request_test_group_edit_view() + self.assertEqual(Action.objects.last().target, self.test_group) + self.assertEqual(Action.objects.last().verb, event_group_edited.id) + + +class UserEventsTestCase(UserTestMixin, GenericViewTestCase): + auto_create_group = False + + def test_user_create_event(self): + self.login_admin_user() + Action.objects.all().delete() + self._request_test_user_create_view() + self.assertEqual(Action.objects.last().target, self.test_user) + self.assertEqual(Action.objects.last().verb, event_user_created.id) + + def test_user_edit_event(self): + self.login_admin_user() + self._create_test_user() + Action.objects.all().delete() + self._request_test_user_edit_view() + self.assertEqual(Action.objects.last().target, self.test_user) + self.assertEqual(Action.objects.last().verb, event_user_edited.id) diff --git a/mayan/apps/user_management/tests/test_views.py b/mayan/apps/user_management/tests/test_views.py index 50a9b25497..12a8659fe0 100644 --- a/mayan/apps/user_management/tests/test_views.py +++ b/mayan/apps/user_management/tests/test_views.py @@ -28,55 +28,55 @@ class UserManagementViewTestCase(UserTestMixin, GenericViewTestCase): super(UserManagementViewTestCase, self).setUp() self.login_user() - def _request_user_create_view(self): - return self.post( - viewname='user_management:user_create', data={ - 'username': TEST_USER_2_USERNAME - } - ) + #def _request_test_user_create_view(self): + # return self.post( + # viewname='user_management:user_create', data={ + # 'username': TEST_USER_2_USERNAME + # } + # ) def test_user_create_view_no_permission(self): - response = self._request_user_create_view() + response = self._request_test_user_create_view() self.assertEqual(response.status_code, 403) self.assertEqual(get_user_model().objects.count(), 2) self.assertFalse(TEST_USER_2_USERNAME in get_user_model().objects.values_list('username', flat=True)) def test_user_create_view_with_permission(self): self.grant_permission(permission=permission_user_create) - response = self._request_user_create_view() + response = self._request_test_user_create_view() self.assertEqual(response.status_code, 302) self.assertEqual(get_user_model().objects.count(), 3) self.assertTrue(TEST_USER_2_USERNAME in get_user_model().objects.values_list('username', flat=True)) def _request_user_groups_view(self): return self.post( - viewname='user_management:user_groups', args=(self.user_2.pk,) + viewname='user_management:user_groups', args=(self.test_user.pk,) ) def test_user_groups_view_no_permission(self): - self._create_test_user_2() + self._create_test_user() response = self._request_user_groups_view() self.assertEqual(response.status_code, 403) def test_user_groups_view_with_access(self): - self._create_test_user_2() - self.grant_access(permission=permission_user_edit, obj=self.user_2) + self._create_test_user() + self.grant_access(permission=permission_user_edit, obj=self.test_user) response = self._request_user_groups_view() self.assertContains( - response=response, text=self.user_2.username, status_code=200 + response=response, text=self.test_user.username, status_code=200 ) def _request_set_password_view(self, password): return self.post( - viewname='user_management:user_set_password', args=(self.user_2.pk,), + viewname='user_management:user_set_password', args=(self.test_user.pk,), data={ 'new_password1': password, 'new_password2': password } ) def test_user_set_password_view_no_access(self): - self._create_test_user_2() + self._create_test_user() response = self._request_set_password_view( password=TEST_USER_PASSWORD_EDITED ) @@ -90,13 +90,13 @@ class UserManagementViewTestCase(UserTestMixin, GenericViewTestCase): username=TEST_USER_2_USERNAME, password=TEST_USER_PASSWORD_EDITED ) - response = self.get('common:current_user_details') + response = self.get(viewname='user_management:current_user_details') self.assertEqual(response.status_code, 302) def test_user_set_password_view_with_access(self): - self._create_test_user_2() - self.grant_access(permission=permission_user_edit, obj=self.user_2) + self._create_test_user() + self.grant_access(permission=permission_user_edit, obj=self.test_user) response = self._request_set_password_view( password=TEST_USER_PASSWORD_EDITED @@ -108,7 +108,7 @@ class UserManagementViewTestCase(UserTestMixin, GenericViewTestCase): self.login( username=TEST_USER_2_USERNAME, password=TEST_USER_PASSWORD_EDITED ) - response = self.get('common:current_user_details') + response = self.get(viewname='user_management:current_user_details') self.assertEqual(response.status_code, 200) @@ -116,14 +116,14 @@ class UserManagementViewTestCase(UserTestMixin, GenericViewTestCase): return self.post( viewname='user_management:user_multiple_set_password', data={ - 'id_list': self.user_2.pk, + 'id_list': self.test_user.pk, 'new_password1': password, 'new_password2': password } ) def test_user_multiple_set_password_view_no_access(self): - self._create_test_user_2() + self._create_test_user() response = self._request_multiple_user_set_password_view( password=TEST_USER_PASSWORD_EDITED ) @@ -137,12 +137,12 @@ class UserManagementViewTestCase(UserTestMixin, GenericViewTestCase): username=TEST_USER_2_USERNAME, password=TEST_USER_PASSWORD_EDITED ) - response = self.get('common:current_user_details') + response = self.get(viewname='user_management:current_user_details') self.assertEqual(response.status_code, 302) def test_user_multiple_set_password_view_with_access(self): - self._create_test_user_2() - self.grant_access(permission=permission_user_edit, obj=self.user_2) + self._create_test_user() + self.grant_access(permission=permission_user_edit, obj=self.test_user) response = self._request_multiple_user_set_password_view( password=TEST_USER_PASSWORD_EDITED @@ -154,24 +154,24 @@ class UserManagementViewTestCase(UserTestMixin, GenericViewTestCase): self.login( username=TEST_USER_2_USERNAME, password=TEST_USER_PASSWORD_EDITED ) - response = self.get('common:current_user_details') + response = self.get(viewname='user_management:current_user_details') self.assertEqual(response.status_code, 200) def _request_user_delete_view(self): return self.post( - viewname='user_management:user_delete', args=(self.user_2.pk,) + viewname='user_management:user_delete', args=(self.test_user.pk,) ) def test_user_delete_view_no_access(self): - self._create_test_user_2() + self._create_test_user() response = self._request_user_delete_view() self.assertEqual(response.status_code, 302) self.assertEqual(get_user_model().objects.count(), 3) def test_user_delete_view_with_access(self): - self._create_test_user_2() - self.grant_access(permission=permission_user_delete, obj=self.user_2) + self._create_test_user() + self.grant_access(permission=permission_user_delete, obj=self.test_user) response = self._request_user_delete_view() self.assertEqual(response.status_code, 302) self.assertEqual(get_user_model().objects.count(), 2) @@ -179,19 +179,19 @@ class UserManagementViewTestCase(UserTestMixin, GenericViewTestCase): def _request_user_multiple_delete_view(self): return self.post( viewname='user_management:user_multiple_delete', data={ - 'id_list': self.user_2.pk + 'id_list': self.test_user.pk } ) def test_user_multiple_delete_view_no_access(self): - self._create_test_user_2() + self._create_test_user() response = self._request_user_multiple_delete_view() self.assertEqual(response.status_code, 302) self.assertEqual(get_user_model().objects.count(), 3) def test_user_multiple_delete_view_with_access(self): - self._create_test_user_2() - self.grant_access(permission=permission_user_delete, obj=self.user_2) + self._create_test_user() + self.grant_access(permission=permission_user_delete, obj=self.test_user) response = self._request_user_multiple_delete_view() self.assertEqual(response.status_code, 302) self.assertEqual(get_user_model().objects.count(), 2) @@ -217,7 +217,8 @@ class MetadataLookupIntegrationTestCase(GenericDocumentViewTestCase): ) response = self.get( - viewname='metadata:metadata_edit', args=(self.document.pk,) + viewname='metadata:document_metadata_edit', + kwargs={'pk': self.document.pk} ) self.assertContains( response=response, text=''.format( @@ -234,7 +235,8 @@ class MetadataLookupIntegrationTestCase(GenericDocumentViewTestCase): ) response = self.get( - viewname='metadata:metadata_edit', args=(self.document.pk,) + viewname='metadata:document_metadata_edit', + kwargs={'pk': self.document.pk} ) self.assertContains(