diff --git a/mayan/apps/document_indexing/tests/test_events.py b/mayan/apps/document_indexing/tests/test_events.py index a57572c60d..eb826100c4 100644 --- a/mayan/apps/document_indexing/tests/test_events.py +++ b/mayan/apps/document_indexing/tests/test_events.py @@ -23,13 +23,14 @@ class IndexTemplateEventsTestCase(DocumentTestMixin, IndexTestMixin, IndexViewTe self.grant_permission( permission=permission_document_indexing_create ) - self._request_test_index_create_view() + response = self._request_test_index_create_view() + self.assertEqual(response.status_code, 302) - self.assertEqual(Action.objects.last().actor, self._test_case_user) - self.assertEqual(Action.objects.last().target, self.test_index) - self.assertEqual( - Action.objects.last().verb, event_index_template_created.id - ) + action = Action.objects.last() + + self.assertEqual(action.actor, self._test_case_user) + self.assertEqual(action.target, self.test_index) + self.assertEqual(action.verb, event_index_template_created.id) def test_index_template_edit_event(self): self._create_test_index() @@ -39,9 +40,11 @@ class IndexTemplateEventsTestCase(DocumentTestMixin, IndexTestMixin, IndexViewTe ) Action.objects.all().delete() - self._request_test_index_edit_view() + response = self._request_test_index_edit_view() + self.assertEqual(response.status_code, 302) - self.assertEqual(Action.objects.last().target, self.test_index) - self.assertEqual( - Action.objects.last().verb, event_index_template_edited.id - ) + action = Action.objects.last() + + self.assertEqual(action.actor, self._test_case_user) + self.assertEqual(action.target, self.test_index) + self.assertEqual(action.verb, event_index_template_edited.id) diff --git a/mayan/apps/user_management/tests/test_events.py b/mayan/apps/user_management/tests/test_events.py index 803771593d..4967578925 100644 --- a/mayan/apps/user_management/tests/test_events.py +++ b/mayan/apps/user_management/tests/test_events.py @@ -23,114 +23,132 @@ from .mixins import ( class GroupEventsTestCase(GroupTestMixin, GroupViewTestMixin, UserTestMixin, GenericViewTestCase): def test_group_create_event(self): - Action.objects.all().delete() - self.grant_permission( permission=permission_group_create ) + Action.objects.all().delete() + self._request_test_group_create_view() - self.assertEqual(Action.objects.last().actor, self._test_case_user) - self.assertEqual(Action.objects.last().target, self.test_group) - self.assertEqual(Action.objects.last().verb, event_group_created.id) + action = Action.objects.last() + + self.assertEqual(action.actor, self._test_case_user) + self.assertEqual(action.target, self.test_group) + self.assertEqual(action.verb, event_group_created.id) def test_group_edit_event(self): self._create_test_group() - Action.objects.all().delete() - self.grant_access( obj=self.test_group, permission=permission_group_edit ) + 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) + action = Action.objects.last() + + self.assertEqual(action.target, self.test_group) + self.assertEqual(action.verb, event_group_edited.id) class GroupEventsAPITestCase(GroupAPITestMixin, GroupTestMixin, GroupViewTestMixin, BaseAPITestCase): def test_group_create_event_from_api_view(self): - Action.objects.all().delete() - self.grant_permission( permission=permission_group_create ) + Action.objects.all().delete() + self._request_test_group_create_api_view() + action = Action.objects.last() + # TODO: Future improvement, find method to record the user who # commited the event. Will required custom serializer .create method - self.assertEqual(Action.objects.last().actor, self.test_group) - self.assertEqual(Action.objects.last().target, self.test_group) - self.assertEqual(Action.objects.last().verb, event_group_created.id) + self.assertEqual(action.actor, self.test_group) + self.assertEqual(action.target, self.test_group) + self.assertEqual(action.verb, event_group_created.id) def test_group_edit_event_from_api_view(self): self._create_test_group() - Action.objects.all().delete() self.grant_access( obj=self.test_group, permission=permission_group_edit ) + Action.objects.all().delete() + self._request_test_group_edit_patch_api_view() + action = Action.objects.last() + # TODO: Future improvement, find method to record the user who # commited the event. Will required custom serializer .update method - self.assertEqual(Action.objects.last().actor, self.test_group) - self.assertEqual(Action.objects.last().target, self.test_group) - self.assertEqual(Action.objects.last().verb, event_group_edited.id) + self.assertEqual(action.actor, self.test_group) + self.assertEqual(action.target, self.test_group) + self.assertEqual(action.verb, event_group_edited.id) class UserEventsTestCase(UserAPITestMixin, UserTestMixin, UserViewTestMixin, GenericViewTestCase): def test_user_create_event_from_view(self): - Action.objects.all().delete() - self.grant_permission( permission=permission_user_create ) + Action.objects.all().delete() + self._request_test_user_create_view() - self.assertEqual(Action.objects.last().actor, self._test_case_user) - self.assertEqual(Action.objects.last().target, self.test_user) - self.assertEqual(Action.objects.last().verb, event_user_created.id) + action = Action.objects.last() + + self.assertEqual(action.actor, self._test_case_user) + self.assertEqual(action.target, self.test_user) + self.assertEqual(action.verb, event_user_created.id) def test_user_edit_event_from_view(self): self._create_test_user() - Action.objects.all().delete() self.grant_access( obj=self.test_user, permission=permission_user_edit ) + Action.objects.all().delete() + self._request_test_user_edit_view() - self.assertEqual(Action.objects.last().actor, self._test_case_user) - self.assertEqual(Action.objects.last().target, self.test_user) - self.assertEqual(Action.objects.last().verb, event_user_edited.id) + action = Action.objects.last() + + self.assertEqual(action.actor, self._test_case_user) + self.assertEqual(action.target, self.test_user) + self.assertEqual(action.verb, event_user_edited.id) class UserEventsAPITestCase(UserAPITestMixin, UserTestMixin, UserViewTestMixin, BaseAPITestCase): def test_user_create_event_from_api_view(self): - Action.objects.all().delete() - self.grant_permission( permission=permission_user_create ) + Action.objects.all().delete() + self._request_test_user_create_api_view() + action = Action.objects.last() + # TODO: Future improvement, find method to record the user who # commited the event. Will required custom serializer .create method - self.assertEqual(Action.objects.last().actor, self.test_user) - self.assertEqual(Action.objects.last().target, self.test_user) - self.assertEqual(Action.objects.last().verb, event_user_created.id) + self.assertEqual(action.actor, self.test_user) + self.assertEqual(action.target, self.test_user) + self.assertEqual(action.verb, event_user_created.id) def test_user_edit_event_from_api_view(self): self._create_test_user() - Action.objects.all().delete() - self.grant_access( obj=self.test_user, permission=permission_user_edit ) + Action.objects.all().delete() + self._request_test_user_edit_patch_api_view() + action = Action.objects.last() + # TODO: Future improvement, find method to record the user who # commited the event. Will required custom serializer .update method - self.assertEqual(Action.objects.last().actor, self.test_user) - self.assertEqual(Action.objects.last().target, self.test_user) - self.assertEqual(Action.objects.last().verb, event_user_edited.id) + self.assertEqual(action.actor, self.test_user) + self.assertEqual(action.target, self.test_user) + self.assertEqual(action.verb, event_user_edited.id)