From d2fd865b688c1b259e2ba114a022020caef1b7a5 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 7 Oct 2019 11:28:34 -0400 Subject: [PATCH] Fix failing tests imports Signed-off-by: Roberto Rosario --- .../apps/authentication/tests/test_events.py | 2 +- .../tests/test_management_commands.py | 2 +- mayan/apps/mailer/tests/test_actions.py | 180 ------------------ 3 files changed, 2 insertions(+), 182 deletions(-) delete mode 100644 mayan/apps/mailer/tests/test_actions.py diff --git a/mayan/apps/authentication/tests/test_events.py b/mayan/apps/authentication/tests/test_events.py index 0fdb597529..0af7df5a07 100644 --- a/mayan/apps/authentication/tests/test_events.py +++ b/mayan/apps/authentication/tests/test_events.py @@ -8,7 +8,7 @@ from django.core import mail from actstream.models import Action -from mayan.apps.common.tests import GenericViewTestCase +from mayan.apps.common.tests.base import GenericViewTestCase from mayan.apps.events.utils import create_system_user from ..events import ( diff --git a/mayan/apps/importer/tests/test_management_commands.py b/mayan/apps/importer/tests/test_management_commands.py index 94aca3a3d1..156a4c1c8d 100644 --- a/mayan/apps/importer/tests/test_management_commands.py +++ b/mayan/apps/importer/tests/test_management_commands.py @@ -6,7 +6,7 @@ from django.core import management from django.utils.encoding import force_bytes from mayan.apps.documents.models import DocumentType, Document -from mayan.apps.documents.tests import GenericDocumentTestCase +from mayan.apps.documents.tests.base import GenericDocumentTestCase from mayan.apps.documents.tests.literals import TEST_SMALL_DOCUMENT_PATH from mayan.apps.storage.utils import fs_cleanup, mkstemp diff --git a/mayan/apps/mailer/tests/test_actions.py b/mayan/apps/mailer/tests/test_actions.py deleted file mode 100644 index eed6d9f49a..0000000000 --- a/mayan/apps/mailer/tests/test_actions.py +++ /dev/null @@ -1,180 +0,0 @@ -from __future__ import unicode_literals - -import json - -from django.core import mail - -from mayan.apps.common.tests import GenericViewTestCase -from mayan.apps.documents.tests.mixins import DocumentTestMixin -from mayan.apps.document_states.literals import WORKFLOW_ACTION_ON_ENTRY -from mayan.apps.document_states.tests.mixins import WorkflowTestMixin -from mayan.apps.document_states.tests.test_actions import ActionTestCase -from mayan.apps.metadata.tests.mixins import MetadataTypeTestMixin - -from ..permissions import permission_user_mailer_use -from ..workflow_actions import EmailAction - -from .literals import ( - TEST_EMAIL_ADDRESS, TEST_EMAIL_BODY, TEST_EMAIL_FROM_ADDRESS, - TEST_EMAIL_SUBJECT -) -from .mixins import MailerTestMixin - - -class EmailActionTestCase(MailerTestMixin, WorkflowTestMixin, ActionTestCase): - def test_email_action_literal_text(self): - self._create_test_user_mailer() - - action = EmailAction( - form_data={ - 'mailing_profile': self.test_user_mailer.pk, - 'recipient': TEST_EMAIL_ADDRESS, - 'subject': TEST_EMAIL_SUBJECT, - 'body': TEST_EMAIL_BODY, - } - ) - action.execute(context={'document': self.test_document}) - 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_email_action_workflow_execute(self): - self._create_test_workflow() - self._create_test_workflow_state() - self._create_test_user_mailer() - - self.test_workflow_state.actions.create( - action_data=json.dumps( - { - 'mailing_profile': self.test_user_mailer.pk, - 'recipient': TEST_EMAIL_ADDRESS, - 'subject': TEST_EMAIL_SUBJECT, - 'body': TEST_EMAIL_BODY, - } - ), - action_path='mayan.apps.mailer.workflow_actions.EmailAction', - label='test email action', when=WORKFLOW_ACTION_ON_ENTRY, - ) - - self.test_workflow_state.initial = True - self.test_workflow_state.save() - self.test_workflow.document_types.add(self.test_document_type) - - self.upload_document() - - 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]) - - -class EmailActionTemplateTestCase(MetadataTypeTestMixin, MailerTestMixin, WorkflowTestMixin, ActionTestCase): - def test_email_action_recipient_template(self): - self._create_test_metadata_type() - self.test_document_type.metadata.create(metadata_type=self.test_metadata_type) - self.test_document.metadata.create(metadata_type=self.test_metadata_type, value=TEST_EMAIL_ADDRESS) - - self._create_test_user_mailer() - - action = EmailAction( - form_data={ - 'mailing_profile': self.test_user_mailer.pk, - 'recipient': '{{{{ document.metadata_value_of.{} }}}}'.format(self.test_metadata_type.name), - 'subject': TEST_EMAIL_SUBJECT, - 'body': '', - } - ) - action.execute(context={'document': self.test_document}) - 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_email_action_subject_template(self): - self._create_test_metadata_type() - self.test_document_type.metadata.create(metadata_type=self.test_metadata_type) - self.test_document.metadata.create(metadata_type=self.test_metadata_type, value=TEST_EMAIL_SUBJECT) - - self._create_test_user_mailer() - - action = EmailAction( - form_data={ - 'mailing_profile': self.test_user_mailer.pk, - 'recipient': TEST_EMAIL_ADDRESS, - 'subject': '{{{{ document.metadata_value_of.{} }}}}'.format(self.test_metadata_type.name), - 'body': '', - } - ) - action.execute(context={'document': self.test_document}) - 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_email_action_body_template(self): - self._create_test_metadata_type() - self.test_document_type.metadata.create(metadata_type=self.test_metadata_type) - self.test_document.metadata.create(metadata_type=self.test_metadata_type, value=TEST_EMAIL_BODY) - - self._create_test_user_mailer() - - action = EmailAction( - form_data={ - 'mailing_profile': self.test_user_mailer.pk, - 'recipient': TEST_EMAIL_ADDRESS, - 'subject': TEST_EMAIL_SUBJECT, - 'body': '{{{{ document.metadata_value_of.{} }}}}'.format(self.test_metadata_type.name), - } - ) - action.execute(context={'document': self.test_document}) - 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]) - self.assertEqual(mail.outbox[0].body, TEST_EMAIL_BODY) - - -class EmailActionViewTestCase(DocumentTestMixin, MailerTestMixin, WorkflowTestMixin, GenericViewTestCase): - auto_upload_document = False - - def test_email_action_create_get_view(self): - self._create_test_workflow() - self._create_test_workflow_state() - self._create_test_user_mailer() - - response = self.get( - viewname='document_states:setup_workflow_state_action_create', - kwargs={ - 'pk': self.test_workflow_state.pk, - 'class_path': 'mayan.apps.mailer.workflow_actions.EmailAction', - } - ) - self.assertEqual(response.status_code, 200) - - self.assertEqual(self.test_workflow_state.actions.count(), 0) - - def _request_email_action_create_post_view(self): - return self.post( - viewname='document_states:setup_workflow_state_action_create', - kwargs={ - 'pk': self.test_workflow_state.pk, - 'class_path': 'mayan.apps.mailer.workflow_actions.EmailAction', - }, data={ - 'when': WORKFLOW_ACTION_ON_ENTRY, - 'label': 'test email action', - 'mailing_profile': self.test_user_mailer.pk, - 'recipient': TEST_EMAIL_ADDRESS, - 'subject': TEST_EMAIL_SUBJECT, - 'body': TEST_EMAIL_BODY, - } - ) - - def test_email_action_create_post_view(self): - self._create_test_workflow() - self._create_test_workflow_state() - self._create_test_user_mailer() - - self.grant_access( - obj=self.test_user_mailer, permission=permission_user_mailer_use - ) - - response = self._request_email_action_create_post_view() - self.assertEqual(response.status_code, 302) - - self.assertEqual(self.test_workflow_state.actions.count(), 1)