summaryrefslogtreecommitdiff
path: root/tests/generic_inline_admin/tests.py
diff options
context:
space:
mode:
authorStephen Burrows <stephen.r.burrows@gmail.com>2014-05-15 20:12:32 -0700
committerTim Graham <timograham@gmail.com>2014-05-16 06:38:24 -0400
commitd64f192df188903ea5a1ab8dfd6679e5d52aaf9b (patch)
tree4e30d099ba136c56c638483123c7477ea64995d4 /tests/generic_inline_admin/tests.py
parent4a981307359d5886d7e982aad8cfdac84d21152c (diff)
Fixed #22628 -- Took initial forms into account when combining FormSet.min_num and FormSet.extra.
Forwardport of 79f15ab1ef from stable/1.7.x
Diffstat (limited to 'tests/generic_inline_admin/tests.py')
-rw-r--r--tests/generic_inline_admin/tests.py5
1 files changed, 2 insertions, 3 deletions
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)