From d64f192df188903ea5a1ab8dfd6679e5d52aaf9b Mon Sep 17 00:00:00 2001 From: Stephen Burrows Date: Thu, 15 May 2014 20:12:32 -0700 Subject: Fixed #22628 -- Took initial forms into account when combining FormSet.min_num and FormSet.extra. Forwardport of 79f15ab1ef from stable/1.7.x --- tests/generic_inline_admin/tests.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tests/generic_inline_admin') diff --git a/tests/generic_inline_admin/tests.py b/tests/generic_inline_admin/tests.py index ed2411ffdf..e73fc40421 100644 --- a/tests/generic_inline_admin/tests.py +++ b/tests/generic_inline_admin/tests.py @@ -204,8 +204,7 @@ class GenericInlineAdminParametersTest(TestCase): def testMinNumParam(self): """ - With extra=3 and min_num=2, there should be six forms. - See #22628 - this will change when that's fixed. + With extra=3 and min_num=2, there should be five forms. """ class MinNumInline(GenericTabularInline): model = Media @@ -220,7 +219,7 @@ class GenericInlineAdminParametersTest(TestCase): request.user = User(username='super', is_superuser=True) response = modeladmin.changeform_view(request, object_id=str(e.pk)) formset = response.context_data['inline_admin_formsets'][0].formset - self.assertEqual(formset.total_form_count(), 6) + self.assertEqual(formset.total_form_count(), 5) self.assertEqual(formset.initial_form_count(), 1) -- cgit v1.3