Fix unit tests.

see #894
This commit is contained in:
Antoine Nguyen
2016-07-06 08:12:17 +02:00
parent 9a5a34b8f6
commit 63d9a1b3e4
3 changed files with 5 additions and 3 deletions
+1 -1
View File
@@ -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(
+2 -2
View File
@@ -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
+2
View File
@@ -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,