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

Fix failing mailer tests

Browse Source 
Signed-off-by: Roberto Rosario <Roberto.Rosario.Gonzalez@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2019-02-19 03:38:09 -04:00
parent 023d82c96c
commit 0e524e44ed
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mayan/apps/mailer/tests/mixins.py
View File

@@ -24,7 +24,7 @@ class MailerTestMixin(object):
)
)
def _request_user_mailer_create(self):
def _request_test_user_mailer_create(self):
return self.post(
viewname='mailer:user_mailer_create', kwargs={
'class_path': TEST_USER_MAILER_BACKEND_PATH
@@ -34,13 +34,13 @@ class MailerTestMixin(object):
}
)
def _request_user_mailer_delete(self):
def _request_test_user_mailer_delete(self):
return self.post(
viewname='mailer:user_mailer_delete',
kwargs={'mailer_id': self.user_mailer.pk}
)
def _request_user_mailer_edit(self):
def _request_test_user_mailer_edit(self):
return self.post(
viewname='mailer:user_mailer_edit',
kwargs={'mailer_id': self.user_mailer.pk},
@@ -49,10 +49,10 @@ class MailerTestMixin(object):
}
)
def _request_user_mailer_list_view(self):
def _request_test_user_mailer_list_view(self):
return self.get(viewname='mailer:user_mailer_list')
def _request_user_mailer_test(self):
def _request_test_user_mailer_test(self):
return self.post(
viewname='mailer:user_mailer_test',
kwargs={'mailer_id': self.user_mailer.pk},

26
mayan/apps/mailer/tests/test_views.py
View File

@@ -27,7 +27,7 @@ from .mixins import MailerTestMixin
class MailerViewsTestCase(MailerTestMixin, GenericViewTestCase):
def test_user_mailer_create_view_no_permissions(self):
response = self._request_user_mailer_create()
response = self._request_test_user_mailer_create()
self.assertNotContains(
response, text=TestBackend.label, status_code=403
@@ -37,7 +37,7 @@ class MailerViewsTestCase(MailerTestMixin, GenericViewTestCase):
def test_user_mailer_create_view_with_permission(self):
self.grant_permission(permission=permission_user_mailer_create)
response = self._request_user_mailer_create()
response = self._request_test_user_mailer_create()
self.assertEqual(response.status_code, 302)
self.assertEqual(UserMailer.objects.count(), 1)
@@ -45,7 +45,7 @@ class MailerViewsTestCase(MailerTestMixin, GenericViewTestCase):
def test_user_mailer_delete_view_no_permissions(self):
self._create_user_mailer()
response = self._request_user_mailer_delete()
response = self._request_test_user_mailer_delete()
self.assertEqual(response.status_code, 404)
self.assertQuerysetEqual(
@@ -59,7 +59,7 @@ class MailerViewsTestCase(MailerTestMixin, GenericViewTestCase):
obj=self.user_mailer, permission=permission_user_mailer_delete
)
response = self._request_user_mailer_delete()
response = self._request_test_user_mailer_delete()
self.assertEqual(response.status_code, 302)
self.assertEqual(UserMailer.objects.count(), 0)
@@ -67,7 +67,7 @@ class MailerViewsTestCase(MailerTestMixin, GenericViewTestCase):
def test_user_mailer_edit_view_no_permission(self):
self._create_user_mailer()
response = self._request_user_mailer_edit()
response = self._request_test_user_mailer_edit()
self.assertEqual(response.status_code, 404)
self.user_mailer.refresh_from_db()
@@ -80,7 +80,7 @@ class MailerViewsTestCase(MailerTestMixin, GenericViewTestCase):
obj=self.user_mailer, permission=permission_user_mailer_edit
)
response = self._request_user_mailer_edit()
response = self._request_test_user_mailer_edit()
self.assertEqual(response.status_code, 302)
self.user_mailer.refresh_from_db()
@@ -89,7 +89,7 @@ class MailerViewsTestCase(MailerTestMixin, GenericViewTestCase):
def test_user_mailer_list_view_no_permissions(self):
self._create_user_mailer()
response = self._request_user_mailer_list_view()
response = self._request_test_user_mailer_list_view()
self.assertNotContains(
response, text=self.user_mailer.label, status_code=200
)
@@ -100,7 +100,7 @@ class MailerViewsTestCase(MailerTestMixin, GenericViewTestCase):
self.grant_access(
permission=permission_user_mailer_view, obj=self.user_mailer
)
response = self._request_user_mailer_list_view()
response = self._request_test_user_mailer_list_view()
self.assertContains(
response, text=self.user_mailer.label, status_code=200
@@ -109,7 +109,7 @@ class MailerViewsTestCase(MailerTestMixin, GenericViewTestCase):
def test_user_mailer_test_view_no_permissions(self):
self._create_user_mailer()
response = self._request_user_mailer_test()
response = self._request_test_user_mailer_test()
self.assertEqual(response.status_code, 404)
@@ -122,7 +122,7 @@ class MailerViewsTestCase(MailerTestMixin, GenericViewTestCase):
obj=self.user_mailer, permission=permission_user_mailer_use
)
response = self._request_user_mailer_test()
response = self._request_test_user_mailer_test()
self.assertEqual(response.status_code, 302)
self.assertEqual(len(mail.outbox), 1)
@@ -137,7 +137,7 @@ class MailerViewsTestCase(MailerTestMixin, GenericViewTestCase):
)
self.test_email_address = TEST_RECIPIENTS_MULTIPLE_COMMA
response = self._request_user_mailer_test()
response = self._request_test_user_mailer_test()
self.assertEqual(response.status_code, 302)
self.assertEqual(len(mail.outbox), 1)
self.assertEqual(mail.outbox[0].from_email, TEST_EMAIL_FROM_ADDRESS)
@@ -153,7 +153,7 @@ class MailerViewsTestCase(MailerTestMixin, GenericViewTestCase):
)
self.test_email_address = TEST_RECIPIENTS_MULTIPLE_MIXED
response = self._request_user_mailer_test()
response = self._request_test_user_mailer_test()
self.assertEqual(response.status_code, 302)
self.assertEqual(len(mail.outbox), 1)
self.assertEqual(mail.outbox[0].from_email, TEST_EMAIL_FROM_ADDRESS)
@@ -169,7 +169,7 @@ class MailerViewsTestCase(MailerTestMixin, GenericViewTestCase):
)
self.test_email_address = TEST_RECIPIENTS_MULTIPLE_SEMICOLON
response = self._request_user_mailer_test()
response = self._request_test_user_mailer_test()
self.assertEqual(response.status_code, 302)
self.assertEqual(len(mail.outbox), 1)
self.assertEqual(mail.outbox[0].from_email, TEST_EMAIL_FROM_ADDRESS)