From daa80aceeca4f0f2a641c23df70c99013dfe0bf6 Mon Sep 17 00:00:00 2001 From: Blake Griffith Date: Wed, 3 Feb 2016 12:42:48 +0200 Subject: [1.9.x] Changed gypsy to manouche in docs and tests. "Gypsy" is considered a slur by the Romani people whom it refers to. "manouche jazz" is used in place of "gypsy jazz" and is an accepted term for the same genre of music. Backport of 5fdbd9e36c861cb9f2cdb255a1bf693de8876f6b from master --- tests/admin_filters/tests.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'tests') diff --git a/tests/admin_filters/tests.py b/tests/admin_filters/tests.py index af189ba0e1..f118750351 100644 --- a/tests/admin_filters/tests.py +++ b/tests/admin_filters/tests.py @@ -259,12 +259,11 @@ class ListFiltersTests(TestCase): title='The Django Book', year=None, author=self.bob, is_best_seller=None, date_registered=self.today, no=103, ) - self.gipsy_book = Book.objects.create( - title='Gipsy guitar for dummies', year=2002, is_best_seller=True, + self.guitar_book = Book.objects.create( + title='Guitar for dummies', year=2002, is_best_seller=True, date_registered=self.one_week_ago, ) - self.gipsy_book.contributors = [self.bob, self.lisa] - self.gipsy_book.save() + self.guitar_book.contributors.set([self.bob, self.lisa]) # Departments self.dev = Department.objects.create(code='DEV', description='Development') @@ -318,7 +317,7 @@ class ListFiltersTests(TestCase): queryset = changelist.get_queryset(request) if (self.today.year, self.today.month) == (self.one_week_ago.year, self.one_week_ago.month): # In case one week ago is in the same month. - self.assertEqual(list(queryset), [self.gipsy_book, self.django_book, self.djangonaut_book]) + self.assertEqual(list(queryset), [self.guitar_book, self.django_book, self.djangonaut_book]) else: self.assertEqual(list(queryset), [self.django_book, self.djangonaut_book]) @@ -343,7 +342,7 @@ class ListFiltersTests(TestCase): queryset = changelist.get_queryset(request) if self.today.year == self.one_week_ago.year: # In case one week ago is in the same year. - self.assertEqual(list(queryset), [self.gipsy_book, self.django_book, self.djangonaut_book]) + self.assertEqual(list(queryset), [self.guitar_book, self.django_book, self.djangonaut_book]) else: self.assertEqual(list(queryset), [self.django_book, self.djangonaut_book]) @@ -368,7 +367,7 @@ class ListFiltersTests(TestCase): # Make sure the correct queryset is returned queryset = changelist.get_queryset(request) - self.assertEqual(list(queryset), [self.gipsy_book, self.django_book, self.djangonaut_book]) + self.assertEqual(list(queryset), [self.guitar_book, self.django_book, self.djangonaut_book]) # Make sure the correct choice is selected filterspec = changelist.get_filters(request)[0][4] @@ -452,7 +451,7 @@ class ListFiltersTests(TestCase): # Make sure the correct queryset is returned queryset = changelist.get_queryset(request) - self.assertEqual(list(queryset), [self.gipsy_book]) + self.assertEqual(list(queryset), [self.guitar_book]) # Make sure the last choice is None and is selected filterspec = changelist.get_filters(request)[0][1] @@ -641,7 +640,7 @@ class ListFiltersTests(TestCase): # Make sure the correct queryset is returned queryset = changelist.get_queryset(request) - self.assertEqual(list(queryset), [self.gipsy_book, self.djangonaut_book]) + self.assertEqual(list(queryset), [self.guitar_book, self.djangonaut_book]) # Make sure the correct choice is selected filterspec = changelist.get_filters(request)[0][3] @@ -742,7 +741,7 @@ class ListFiltersTests(TestCase): # Make sure the correct queryset is returned queryset = changelist.get_queryset(request) - self.assertEqual(list(queryset), [self.gipsy_book, self.djangonaut_book]) + self.assertEqual(list(queryset), [self.guitar_book, self.djangonaut_book]) # Make sure the correct choice is selected filterspec = changelist.get_filters(request)[0][1] -- cgit v1.3