summaryrefslogtreecommitdiff
path: root/tests/admin_filters
diff options
context:
space:
mode:
authorDražen Odobašić <dodobas@candela-it.com>2015-09-11 19:33:12 -0400
committerTim Graham <timograham@gmail.com>2015-09-12 11:40:50 -0400
commitb1e33ceceda1e75ff68c7deed8f6659683a195d3 (patch)
treee4e446f69194f2dc3c9c7ee3ecf48290ea8d4d31 /tests/admin_filters
parent84b0a8d2aad042fb573df5055b6153770d0929ac (diff)
downloaddjango-b1e33ceceda1e75ff68c7deed8f6659683a195d3.tar.gz
Fixed #23395 -- Limited line lengths to 119 characters.
Diffstat (limited to 'tests/admin_filters')
-rw-r--r--tests/admin_filters/models.py10
-rw-r--r--tests/admin_filters/tests.py53
2 files changed, 51 insertions, 12 deletions
diff --git a/tests/admin_filters/models.py b/tests/admin_filters/models.py
index 9f89809349..40f25d2f30 100644
--- a/tests/admin_filters/models.py
+++ b/tests/admin_filters/models.py
@@ -20,10 +20,16 @@ class Book(models.Model):
related_name='books_authored',
blank=True, null=True,
)
- contributors = models.ManyToManyField(User, verbose_name="Verbose Contributors", related_name='books_contributed', blank=True)
+ contributors = models.ManyToManyField(
+ User,
+ verbose_name="Verbose Contributors",
+ related_name='books_contributed',
+ blank=True,
+ )
is_best_seller = models.NullBooleanField(default=0)
date_registered = models.DateField(null=True)
- no = models.IntegerField(verbose_name='number', blank=True, null=True) # This field is intentionally 2 characters long. See #16080.
+ # This field name is intentionally 2 characters long (#16080).
+ no = models.IntegerField(verbose_name='number', blank=True, null=True)
def __str__(self):
return self.title
diff --git a/tests/admin_filters/tests.py b/tests/admin_filters/tests.py
index 5a230cd983..f17928e4b1 100644
--- a/tests/admin_filters/tests.py
+++ b/tests/admin_filters/tests.py
@@ -129,11 +129,25 @@ class BookAdmin(ModelAdmin):
class BookAdminWithTupleBooleanFilter(BookAdmin):
- list_filter = ('year', 'author', 'contributors', ('is_best_seller', BooleanFieldListFilter), 'date_registered', 'no')
+ list_filter = (
+ 'year',
+ 'author',
+ 'contributors',
+ ('is_best_seller', BooleanFieldListFilter),
+ 'date_registered',
+ 'no',
+ )
class BookAdminWithUnderscoreLookupAndTuple(BookAdmin):
- list_filter = ('year', ('author__email', AllValuesFieldListFilter), 'contributors', 'is_best_seller', 'date_registered', 'no')
+ list_filter = (
+ 'year',
+ ('author__email', AllValuesFieldListFilter),
+ 'contributors',
+ 'is_best_seller',
+ 'date_registered',
+ 'no',
+ )
class BookAdminWithCustomQueryset(ModelAdmin):
@@ -231,10 +245,22 @@ class ListFiltersTests(TestCase):
self.lisa = User.objects.create_user('lisa', 'lisa@example.com')
# Books
- self.djangonaut_book = Book.objects.create(title='Djangonaut: an art of living', year=2009, author=self.alfred, is_best_seller=True, date_registered=self.today)
- self.bio_book = Book.objects.create(title='Django: a biography', year=1999, author=self.alfred, is_best_seller=False, no=207)
- self.django_book = Book.objects.create(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, date_registered=self.one_week_ago)
+ self.djangonaut_book = Book.objects.create(
+ title='Djangonaut: an art of living', year=2009,
+ author=self.alfred, is_best_seller=True, date_registered=self.today,
+ )
+ self.bio_book = Book.objects.create(
+ title='Django: a biography', year=1999, author=self.alfred,
+ is_best_seller=False, no=207,
+ )
+ self.django_book = Book.objects.create(
+ 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,
+ date_registered=self.one_week_ago,
+ )
self.gipsy_book.contributors = [self.bob, self.lisa]
self.gipsy_book.save()
@@ -247,9 +273,13 @@ class ListFiltersTests(TestCase):
self.jack = Employee.objects.create(name='Jack Red', department=self.design)
def get_changelist(self, request, model, modeladmin):
- return ChangeList(request, model, modeladmin.list_display, modeladmin.list_display_links,
- modeladmin.list_filter, modeladmin.date_hierarchy, modeladmin.search_fields,
- modeladmin.list_select_related, modeladmin.list_per_page, modeladmin.list_max_show_all, modeladmin.list_editable, modeladmin)
+ return ChangeList(
+ request, model, modeladmin.list_display,
+ modeladmin.list_display_links, modeladmin.list_filter,
+ modeladmin.date_hierarchy, modeladmin.search_fields,
+ modeladmin.list_select_related, modeladmin.list_per_page,
+ modeladmin.list_max_show_all, modeladmin.list_editable, modeladmin,
+ )
def test_datefieldlistfilter(self):
modeladmin = BookAdmin(Book, site)
@@ -730,7 +760,10 @@ class ListFiltersTests(TestCase):
choices = list(filterspec.choices(changelist))
self.assertEqual(choices[3]['display'], 'the 2000\'s')
self.assertEqual(choices[3]['selected'], True)
- self.assertEqual(choices[3]['query_string'], '?author__id__exact=%s&publication-decade=the+00s' % self.alfred.pk)
+ self.assertEqual(
+ choices[3]['query_string'],
+ '?author__id__exact=%s&publication-decade=the+00s' % self.alfred.pk
+ )
filterspec = changelist.get_filters(request)[0][0]
self.assertEqual(force_text(filterspec.title), 'Verbose Author')