p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[1.8.x] Fixed admin_filters test failures when run in reverse. 

Backport of b1b14587ae from master
This commit is contained in:
Tim Graham 2015-11-14 10:23:36 -05:00
parent e9c9f2ed82
commit 8b99603120
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/admin_filters/tests.py
View File

@ -866,7 +866,7 @@ class ListFiltersTests(TestCase):
""" """
modeladmin = DepartmentFilterEmployeeAdmin(Employee, site) modeladmin = DepartmentFilterEmployeeAdmin(Employee, site)
request = self.request_factory.get('/', {'department': self.john.pk}) request = self.request_factory.get('/', {'department': self.john.department.pk})
changelist = self.get_changelist(request, Employee, modeladmin) changelist = self.get_changelist(request, Employee, modeladmin)
queryset = changelist.get_queryset(request) queryset = changelist.get_queryset(request)
@ -878,7 +878,7 @@ class ListFiltersTests(TestCase):
choices = list(filterspec.choices(changelist)) choices = list(filterspec.choices(changelist))
self.assertEqual(choices[1]['display'], 'DEV') self.assertEqual(choices[1]['display'], 'DEV')
self.assertEqual(choices[1]['selected'], True) self.assertEqual(choices[1]['selected'], True)
self.assertEqual(choices[1]['query_string'], '?department=%s' % self.john.pk) self.assertEqual(choices[1]['query_string'], '?department=%s' % self.john.department.pk)
def test_lookup_with_non_string_value_underscored(self): def test_lookup_with_non_string_value_underscored(self):
""" """
@ -887,7 +887,7 @@ class ListFiltersTests(TestCase):
Refs #19182 Refs #19182
""" """
modeladmin = DepartmentFilterUnderscoredEmployeeAdmin(Employee, site) modeladmin = DepartmentFilterUnderscoredEmployeeAdmin(Employee, site)
request = self.request_factory.get('/', {'department__whatever': self.john.pk}) request = self.request_factory.get('/', {'department__whatever': self.john.department.pk})
changelist = self.get_changelist(request, Employee, modeladmin) changelist = self.get_changelist(request, Employee, modeladmin)
queryset = changelist.get_queryset(request) queryset = changelist.get_queryset(request)
@ -899,7 +899,7 @@ class ListFiltersTests(TestCase):
choices = list(filterspec.choices(changelist)) choices = list(filterspec.choices(changelist))
self.assertEqual(choices[1]['display'], 'DEV') self.assertEqual(choices[1]['display'], 'DEV')
self.assertEqual(choices[1]['selected'], True) self.assertEqual(choices[1]['selected'], True)
self.assertEqual(choices[1]['query_string'], '?department__whatever=%s' % self.john.pk) self.assertEqual(choices[1]['query_string'], '?department__whatever=%s' % self.john.department.pk)
def test_fk_with_to_field(self): def test_fk_with_to_field(self):
""" """