Increase coverage.

This commit is contained in:
Antoine Nguyen
2016-11-23 17:35:18 +01:00
parent e0d9e8061c
commit 475fe58946
3 changed files with 19 additions and 6 deletions
+2 -1
View File
@@ -46,7 +46,8 @@ def _domains(request):
sort_order, sort_dir = get_sort_order(request.GET, "name")
extra_filters = reduce(
lambda a, b: a + b,
[result for result in signals.extra_domain_filters(sender="_domains")]
[result[1] for result in
signals.extra_domain_filters.send(sender="_domains")]
)
filters = dict(
(flt, request.GET.get(flt, None))
+4 -3
View File
@@ -17,7 +17,7 @@ class ServiceFactory(factory.DjangoModelFactory):
model = models.Service
django_get_or_create = ('name', )
name = 'dummy'
name = "dummy"
class RelayDomainFactory(PermissionFactory):
@@ -26,8 +26,9 @@ class RelayDomainFactory(PermissionFactory):
class Meta:
model = models.RelayDomain
django_get_or_create = ("domain", )
domain = factory.SubFactory(DomainFactory)
target_host = 'external.host.tld'
domain = factory.SubFactory(DomainFactory, type="relaydomain")
target_host = "external.host.tld"
verify_recipients = True
service = factory.SubFactory(ServiceFactory)
+13 -2
View File
@@ -1,5 +1,7 @@
"""modoboa-admin-relaydomains unit tests."""
import json
from django.core.files.base import ContentFile
from django.core.urlresolvers import reverse
from django.test import TestCase
@@ -62,15 +64,24 @@ class RelayDomainsTestCase(ModoTestCase, Operations):
"""Create test data."""
super(RelayDomainsTestCase, cls).setUpTestData()
admin_factories.populate_database()
cls.rdom = RelayDomainFactory(domain__name='relaydomain.tld')
cls.rdom = RelayDomainFactory(domain__name="relaydomain.tld")
admin_factories.DomainAliasFactory(
name='relaydomainalias.tld', target=cls.rdom.domain)
name="relaydomainalias.tld", target=cls.rdom.domain)
admin_factories.MailboxFactory(
domain=cls.rdom.domain, address="local",
user__username="local@relaydomain.tld",
user__groups=("SimpleUsers", )
)
def test_domain_list_view(self):
"""Make sure relaydomain is listed."""
url = reverse("admin:_domain_list")
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
content = json.loads(response.content)
self.assertIn("relaydomain.tld", content["rows"])
self.assertIn("Relay Domain", content["rows"])
def test_create_relaydomain(self):
"""Test the creation of a relay domain.