summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-11-14 10:23:36 -0500
committerTim Graham <timograham@gmail.com>2015-11-14 11:32:05 -0500
commita58150df3f04d64fccb35adf4e630216ea834001 (patch)
treea8300ba3d14cb94eb11403cb28b896bf5fa745c0
parentfe79bc3ed97bbc719dba3e91eebfee3016b5e55a (diff)
[1.9.x] Fixed admin_filters test failures when run in reverse.
Backport of b1b14587aedbb4fd37a99b7bf5345abae279322d from master
-rw-r--r--tests/admin_filters/tests.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/admin_filters/tests.py b/tests/admin_filters/tests.py
index 8363a44192..af189ba0e1 100644
--- a/tests/admin_filters/tests.py
+++ b/tests/admin_filters/tests.py
@@ -909,7 +909,7 @@ class ListFiltersTests(TestCase):
"""
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)
queryset = changelist.get_queryset(request)
@@ -921,7 +921,7 @@ class ListFiltersTests(TestCase):
choices = list(filterspec.choices(changelist))
self.assertEqual(choices[1]['display'], 'DEV')
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):
"""
@@ -930,7 +930,7 @@ class ListFiltersTests(TestCase):
Refs #19182
"""
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)
queryset = changelist.get_queryset(request)
@@ -942,7 +942,7 @@ class ListFiltersTests(TestCase):
choices = list(filterspec.choices(changelist))
self.assertEqual(choices[1]['display'], 'DEV')
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):
"""