summaryrefslogtreecommitdiff
path: root/tests/modeladmin
diff options
context:
space:
mode:
authorMalcolm Box <malcolm@tellybug.com>2015-09-10 14:05:31 +0100
committerTim Graham <timograham@gmail.com>2015-09-11 09:28:34 -0400
commit1d8eb0cae57731b481a88dca272b2cb0d645bd8e (patch)
tree787e129c1fde9c1ea330a9779f2cc746dfb46017 /tests/modeladmin
parentcf99bae53af2ed8f73622bc8a8ed0331c272fda3 (diff)
Fixed #25374 -- Made ModelAdmin checks work on instances instead of classes.
This allows dynamically-generated attributes to be specified in checked ModelAdmin attributes without triggering errors.
Diffstat (limited to 'tests/modeladmin')
-rw-r--r--tests/modeladmin/tests.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/modeladmin/tests.py b/tests/modeladmin/tests.py
index 918daffe3e..beeb493560 100644
--- a/tests/modeladmin/tests.py
+++ b/tests/modeladmin/tests.py
@@ -572,7 +572,8 @@ class CheckTestCase(SimpleTestCase):
def assertIsInvalid(self, model_admin, model, msg,
id=None, hint=None, invalid_obj=None):
invalid_obj = invalid_obj or model_admin
- errors = model_admin.check(model=model)
+ admin_obj = model_admin(model, AdminSite())
+ errors = admin_obj.check()
expected = [
Error(
msg,
@@ -589,7 +590,8 @@ class CheckTestCase(SimpleTestCase):
Same as assertIsInvalid but treats the given msg as a regexp.
"""
invalid_obj = invalid_obj or model_admin
- errors = model_admin.check(model=model)
+ admin_obj = model_admin(model, AdminSite())
+ errors = admin_obj.check()
self.assertEqual(len(errors), 1)
error = errors[0]
self.assertEqual(error.hint, hint)
@@ -598,7 +600,8 @@ class CheckTestCase(SimpleTestCase):
six.assertRegex(self, error.msg, msg)
def assertIsValid(self, model_admin, model):
- errors = model_admin.check(model=model)
+ admin_obj = model_admin(model, AdminSite())
+ errors = admin_obj.check()
expected = []
self.assertEqual(errors, expected)