Skip to content

Commit 2ab2550

Browse files
author
Ryan P Kilby
committed
Fix isnull_override test
1 parent 8aa27e6 commit 2ab2550

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

tests/filters.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class Meta:
1919
class UserFilter(FilterSet):
2020
username = filters.CharFilter(name='username')
2121
email = filters.CharFilter(name='email')
22+
last_login = filters.AllLookupsFilter()
2223
is_active = filters.BooleanFilter(name='is_active')
2324

2425
class Meta:

tests/test_filterset.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ def setUpTestData(cls):
454454
john = Person.objects.create(name="John")
455455
Person.objects.create(name="Mark", best_friend=john)
456456

457-
User.objects.create(username="user1", email="user1@example.org", is_active=True)
457+
User.objects.create(username="user1", email="user1@example.org", is_active=True, last_login=datetime.date.today())
458458
User.objects.create(username="user2", email="user2@example.org", is_active=False)
459459

460460
def test_inset_number_filter(self):
@@ -599,23 +599,24 @@ def test_boolean_filter(self):
599599
self.assertEqual(results[0].username, 'user2')
600600

601601
def test_isnull_override(self):
602+
import django_filters.filters
603+
602604
self.assertIsInstance(
603-
PersonFilter().filters['best_friend__isnull'],
605+
UserFilter().filters['last_login__isnull'],
604606
django_filters.filters.BooleanFilter
605607
)
606608

607-
GET = {'best_friend__isnull': 'true'}
608-
filterset = PersonFilter(GET, queryset=Person.objects.all())
609+
GET = {'last_login__isnull': 'false'}
610+
filterset = UserFilter(GET, queryset=User.objects.all())
609611
results = list(filterset)
610612
self.assertEqual(len(results), 1)
611-
self.assertEqual(results[0].name, 'John')
613+
self.assertEqual(results[0].username, 'user1')
612614

613-
# Uppercase False
614-
GET = {'best_friend__isnull': 'false'}
615-
filterset = PersonFilter(GET, queryset=Person.objects.all())
615+
GET = {'last_login__isnull': 'true'}
616+
filterset = UserFilter(GET, queryset=User.objects.all())
616617
results = list(filterset)
617618
self.assertEqual(len(results), 1)
618-
self.assertEqual(results[0].name, 'Mark')
619+
self.assertEqual(results[0].username, 'user2')
619620

620621

621622
class FilterExclusionTests(TestCase):

0 commit comments

Comments
 (0)