diff options
| author | Stephen Burrows <stephen.r.burrows@gmail.com> | 2014-05-15 20:12:32 -0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-05-16 06:38:24 -0400 |
| commit | d64f192df188903ea5a1ab8dfd6679e5d52aaf9b (patch) | |
| tree | 4e30d099ba136c56c638483123c7477ea64995d4 /tests/admin_inlines | |
| parent | 4a981307359d5886d7e982aad8cfdac84d21152c (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/admin_inlines')
| -rw-r--r-- | tests/admin_inlines/tests.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/admin_inlines/tests.py b/tests/admin_inlines/tests.py index 7025158aab..5d97381f18 100644 --- a/tests/admin_inlines/tests.py +++ b/tests/admin_inlines/tests.py @@ -247,7 +247,6 @@ class TestInline(TestCase): def test_custom_min_num(self): """ Ensure that get_min_num is called and used correctly. - See #22628 - this will change when that's fixed. """ bt_head = BinaryTree.objects.create(name="Tree Head") BinaryTree.objects.create(name="First Child", parent=bt_head) @@ -277,7 +276,7 @@ class TestInline(TestCase): request.user = User(username='super', is_superuser=True) response = modeladmin.changeform_view(request, object_id=str(bt_head.id)) self.assertContains(response, min_forms % 5) - self.assertContains(response, total_forms % 9) + self.assertContains(response, total_forms % 8) def test_inline_nonauto_noneditable_pk(self): response = self.client.get('/admin/admin_inlines/author/add/') |