diff options
author | Nick Pope <nick.pope@flightdataservices.com> | 2020-07-30 12:45:32 +0100 |
---|---|---|
committer | Carlton Gibson <carlton@noumenal.es> | 2020-08-06 12:38:56 +0200 |
commit | b203ec70fd7ffc4027380940157d1cf9c9e588ad (patch) | |
tree | 4c5a6ca119837a0c951ae805e0d25b694edddf4f /tests/admin_changelist | |
parent | ee1ddcbab9f2453ae4959a8556b6cadeb4bb0867 (diff) | |
download | django-b203ec70fd7ffc4027380940157d1cf9c9e588ad.tar.gz |
Refs #25513 -- Adjusted admin pagination to be 1-indexed.
Diffstat (limited to 'tests/admin_changelist')
-rw-r--r-- | tests/admin_changelist/tests.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/admin_changelist/tests.py b/tests/admin_changelist/tests.py index 38143bf592..68319d69d4 100644 --- a/tests/admin_changelist/tests.py +++ b/tests/admin_changelist/tests.py @@ -259,7 +259,7 @@ class ChangeListTests(TestCase): Regression test for #14312: list_editable with pagination """ new_parent = Parent.objects.create(name='parent') - for i in range(200): + for i in range(1, 201): Child.objects.create(name='name %s' % i, parent=new_parent) request = self.factory.get('/child/', data={'p': -1}) # Anything outside range request.user = self.superuser @@ -274,7 +274,7 @@ class ChangeListTests(TestCase): def test_custom_paginator(self): new_parent = Parent.objects.create(name='parent') - for i in range(200): + for i in range(1, 201): Child.objects.create(name='name %s' % i, parent=new_parent) request = self.factory.get('/child/') @@ -576,7 +576,7 @@ class ChangeListTests(TestCase): use queryset set by modeladmin. """ parent = Parent.objects.create(name='anything') - for i in range(30): + for i in range(1, 31): Child.objects.create(name='name %s' % i, parent=parent) Child.objects.create(name='filtered %s' % i, parent=parent) @@ -652,7 +652,7 @@ class ChangeListTests(TestCase): def test_show_all(self): parent = Parent.objects.create(name='anything') - for i in range(30): + for i in range(1, 31): Child.objects.create(name='name %s' % i, parent=parent) Child.objects.create(name='filtered %s' % i, parent=parent) @@ -969,7 +969,7 @@ class ChangeListTests(TestCase): custom_site.register(UnorderedObject, UnorderedObjectAdmin) model_admin = UnorderedObjectAdmin(UnorderedObject, custom_site) counter = 0 if ascending else 51 - for page in range(0, 5): + for page in range(1, 6): request = self._mocked_authenticated_request('/unorderedobject/?p=%s' % page, superuser) response = model_admin.changelist_view(request) for result in response.context_data['cl'].result_list: @@ -1013,7 +1013,7 @@ class ChangeListTests(TestCase): custom_site.register(OrderedObject, OrderedObjectAdmin) model_admin = OrderedObjectAdmin(OrderedObject, custom_site) counter = 0 if ascending else 51 - for page in range(0, 5): + for page in range(1, 6): request = self._mocked_authenticated_request('/orderedobject/?p=%s' % page, superuser) response = model_admin.changelist_view(request) for result in response.context_data['cl'].result_list: @@ -1245,12 +1245,12 @@ class ChangeListTests(TestCase): per_page = cl.list_per_page = 10 for page_num, objects_count, expected_page_range in [ - (0, per_page, []), - (0, per_page * 2, list(range(2))), - (5, per_page * 11, list(range(11))), - (5, per_page * 12, [0, 1, 2, 3, 4, 5, 6, 7, 8, '.', 10, 11]), - (6, per_page * 12, [0, 1, '.', 3, 4, 5, 6, 7, 8, 9, 10, 11]), - (6, per_page * 13, [0, 1, '.', 3, 4, 5, 6, 7, 8, 9, '.', 11, 12]), + (1, per_page, []), + (1, per_page * 2, list(range(1, 3))), + (6, per_page * 11, list(range(1, 12))), + (6, per_page * 12, [1, 2, 3, 4, 5, 6, 7, 8, 9, '.', 11, 12]), + (7, per_page * 12, [1, 2, '.', 4, 5, 6, 7, 8, 9, 10, 11, 12]), + (7, per_page * 13, [1, 2, '.', 4, 5, 6, 7, 8, 9, 10, '.', 12, 13]), ]: # assuming we have exactly `objects_count` objects Group.objects.all().delete() |