From 63d9a1b3e4e4b26640fc952fbea16ab85db95fc4 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 6 Jul 2016 08:12:17 +0200 Subject: [PATCH] Fix unit tests. see #894 --- modoboa/admin/tests/test_domain.py | 2 +- modoboa/limits/models.py | 4 ++-- modoboa/limits/tests/test_user_limits.py | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modoboa/admin/tests/test_domain.py b/modoboa/admin/tests/test_domain.py index 57c11c2ac..cef7c0f54 100644 --- a/modoboa/admin/tests/test_domain.py +++ b/modoboa/admin/tests/test_domain.py @@ -155,7 +155,7 @@ class DomainTestCase(ModoTestCase): 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("Summary", response.content) self.assertIn("Administrators", response.content) self.assertNotIn("Resources usage", response.content) parameters.save_admin( diff --git a/modoboa/limits/models.py b/modoboa/limits/models.py index 58f894b40..9808552ca 100644 --- a/modoboa/limits/models.py +++ b/modoboa/limits/models.py @@ -61,7 +61,7 @@ class UserObjectLimit(ObjectLimitMixin, models.Model): return tpl return None - @cached_property + @property def current_value(self): """Return the current number of objects.""" if "extra_filters" not in self.definition: @@ -118,7 +118,7 @@ class DomainObjectLimit(ObjectLimitMixin, models.Model): return tpl return None - @cached_property + @property def current_value(self): """Return the current number of objects.""" definition = self.definition diff --git a/modoboa/limits/tests/test_user_limits.py b/modoboa/limits/tests/test_user_limits.py index b00ace977..791c37e42 100644 --- a/modoboa/limits/tests/test_user_limits.py +++ b/modoboa/limits/tests/test_user_limits.py @@ -48,6 +48,8 @@ class ResourceTestCase(lib_tests.ModoTestCase): def setUpTestData(cls): """Custom setUpTestData method.""" super(ResourceTestCase, cls).setUpTestData() + parameters.save_admin("ENABLE_ADMIN_LIMITS", "yes") + parameters.save_admin("ENABLE_DOMAIN_LIMITS", "no") for name, tpl in utils.get_user_limit_templates(): parameters.save_admin( "DEFLT_USER_{0}_LIMIT".format(name.upper()), 2,