From b1b14587aedbb4fd37a99b7bf5345abae279322d Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Sat, 14 Nov 2015 10:23:36 -0500
Subject: [PATCH] Fixed admin_filters test failures when run in reverse.
---
tests/admin_filters/tests.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/admin_filters/tests.py b/tests/admin_filters/tests.py
index 11f81fc3ed..2cb8e6a7e9 100644
--- a/tests/admin_filters/tests.py
+++ b/tests/admin_filters/tests.py
@@ -929,7 +929,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)
@@ -941,7 +941,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):
"""
@@ -950,7 +950,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)
@@ -962,7 +962,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):
"""