summaryrefslogtreecommitdiff
path: root/tests/admin_views
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/admin_views
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/admin_views')
-rw-r--r--tests/admin_views/tests.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
index 942f033b6f..fbeca604d4 100644
--- a/tests/admin_views/tests.py
+++ b/tests/admin_views/tests.py
@@ -6,7 +6,7 @@ import os
import re
import unittest
-from django.contrib.admin import ModelAdmin
+from django.contrib.admin import AdminSite, ModelAdmin
from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
from django.contrib.admin.models import ADDITION, DELETION, LogEntry
from django.contrib.admin.options import TO_FIELD_VAR
@@ -6128,14 +6128,15 @@ class AdminViewOnSiteTests(TestCase):
def test_check(self):
"Ensure that the view_on_site value is either a boolean or a callable"
try:
+ admin = CityAdmin(City, AdminSite())
CityAdmin.view_on_site = True
- self.assertEqual(CityAdmin.check(City), [])
+ self.assertEqual(admin.check(), [])
CityAdmin.view_on_site = False
- self.assertEqual(CityAdmin.check(City), [])
+ self.assertEqual(admin.check(), [])
CityAdmin.view_on_site = lambda obj: obj.get_absolute_url()
- self.assertEqual(CityAdmin.check(City), [])
+ self.assertEqual(admin.check(), [])
CityAdmin.view_on_site = []
- self.assertEqual(CityAdmin.check(City), [
+ self.assertEqual(admin.check(), [
Error(
"The value of 'view_on_site' must be a callable or a boolean value.",
hint=None,