From a8f311501a29d014d25b129772ea0d3035ed7a1f Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Mon, 6 Jun 2016 17:17:47 +0200 Subject: [PATCH] Unit test added. see #883 --- modoboa/admin/tests/test_domain.py | 16 ++++++++++++++++ modoboa/limits/handlers.py | 2 ++ 2 files changed, 18 insertions(+) diff --git a/modoboa/admin/tests/test_domain.py b/modoboa/admin/tests/test_domain.py index 95d4b90a6..57c11c2ac 100644 --- a/modoboa/admin/tests/test_domain.py +++ b/modoboa/admin/tests/test_domain.py @@ -146,3 +146,19 @@ class DomainTestCase(ModoTestCase): content = json.loads(response.content) self.assertIn("test.com", content) self.assertIn("test2.com", content) + + def test_domain_detail_view(self): + """Test Domain detail view.""" + parameters.save_admin( + "ENABLE_DOMAIN_LIMITS", "no", app="limits") + domain = Domain.objects.get(name="test.com") + url = reverse("admin:domain_detail", args=[domain.pk]) + response = self.client.get(url) + self.assertEqual(response.status_code, 200) + self.assertIn("Information", response.content) + self.assertIn("Administrators", response.content) + self.assertNotIn("Resources usage", response.content) + parameters.save_admin( + "ENABLE_DOMAIN_LIMITS", "yes", app="limits") + response = self.client.get(url) + self.assertIn("Resources usage", response.content) diff --git a/modoboa/limits/handlers.py b/modoboa/limits/handlers.py index 7dd31e998..116c75ac5 100644 --- a/modoboa/limits/handlers.py +++ b/modoboa/limits/handlers.py @@ -72,6 +72,8 @@ def create_domain_limits(sender, instance, **kwargs): @receiver(admin_signals.extra_domain_dashboard_widgets) def display_domain_limits(sender, user, domain, **kwargs): """Display resources usage for domain.""" + if parameters.get_admin("ENABLE_DOMAIN_LIMITS") == "no": + return [] return [{ "column": "right", "template": "limits/domain_resources_widget.html",