Forms in model formsets and inline formsets can now be deleted even if they don't validate. Related to #9587.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10283 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 89 insertions, 0 deletions

diff --git a/tests/regressiontests/inline_formsets/models.py b/tests/regressiontests/inline_formsets/models.py
index 8b6f5dd342..9b1f8b4932 100644
--- a/tests/regressiontests/inline_formsets/models.py
+++ b/tests/regressiontests/inline_formsets/models.py
@@ -13,6 +13,19 @@ class Child(models.Model):
     school = models.ForeignKey(School)
     name = models.CharField(max_length=100)
 
+class Poet(models.Model):
+    name = models.CharField(max_length=100)
+
+    def __unicode__(self):
+        return self.name
+
+class Poem(models.Model):
+    poet = models.ForeignKey(Poet)
+    name = models.CharField(max_length=100)
+
+    def __unicode__(self):
+        return self.name
+
 __test__ = {'API_TESTS': """
 
 >>> from django.forms.models import inlineformset_factory
diff --git a/tests/regressiontests/inline_formsets/tests.py b/tests/regressiontests/inline_formsets/tests.py
new file mode 100644
index 0000000000..5cd5209b25
--- /dev/null
+++ b/tests/regressiontests/inline_formsets/tests.py
@@ -0,0 +1,76 @@
+from django.test import TestCase
+from django.forms.models import inlineformset_factory
+from regressiontests.inline_formsets.models import Poet, Poem
+
+class DeletionTests(TestCase):
+    def test_deletion(self):
+        PoemFormSet = inlineformset_factory(Poet, Poem, can_delete=True)
+        poet = Poet.objects.create(name='test')
+        poet.poem_set.create(name='test poem')
+        data = {
+            'poem_set-TOTAL_FORMS': u'1',
+            'poem_set-INITIAL_FORMS': u'1',
+            'poem_set-0-id': u'1',
+            'poem_set-0-poem': u'1',
+            'poem_set-0-name': u'test',
+            'poem_set-0-DELETE': u'on',
+        }
+        formset = PoemFormSet(data, instance=poet)
+        formset.save()
+        self.assertTrue(formset.is_valid())
+        self.assertEqual(Poem.objects.count(), 0)
+
+    def test_add_form_deletion_when_invalid(self):
+        """
+        Make sure that an add form that is filled out, but marked for deletion
+        doesn't cause validation errors.
+        """
+        PoemFormSet = inlineformset_factory(Poet, Poem, can_delete=True)
+        poet = Poet.objects.create(name='test')
+        data = {
+            'poem_set-TOTAL_FORMS': u'1',
+            'poem_set-INITIAL_FORMS': u'0',
+            'poem_set-0-id': u'',
+            'poem_set-0-poem': u'1',
+            'poem_set-0-name': u'x' * 1000,
+        }
+        formset = PoemFormSet(data, instance=poet)
+        # Make sure this form doesn't pass validation.
+        self.assertEqual(formset.is_valid(), False)
+        self.assertEqual(Poem.objects.count(), 0)
+
+        # Then make sure that it *does* pass validation and delete the object,
+        # even though the data isn't actually valid.
+        data['poem_set-0-DELETE'] = 'on'
+        formset = PoemFormSet(data, instance=poet)
+        self.assertEqual(formset.is_valid(), True)
+        formset.save()
+        self.assertEqual(Poem.objects.count(), 0)
+
+    def test_change_form_deletion_when_invalid(self):
+        """
+        Make sure that a change form that is filled out, but marked for deletion
+        doesn't cause validation errors.
+        """
+        PoemFormSet = inlineformset_factory(Poet, Poem, can_delete=True)
+        poet = Poet.objects.create(name='test')
+        poet.poem_set.create(name='test poem')
+        data = {
+            'poem_set-TOTAL_FORMS': u'1',
+            'poem_set-INITIAL_FORMS': u'1',
+            'poem_set-0-id': u'1',
+            'poem_set-0-poem': u'1',
+            'poem_set-0-name': u'x' * 1000,
+        }
+        formset = PoemFormSet(data, instance=poet)
+        # Make sure this form doesn't pass validation.
+        self.assertEqual(formset.is_valid(), False)
+        self.assertEqual(Poem.objects.count(), 1)
+
+        # Then make sure that it *does* pass validation and delete the object,
+        # even though the data isn't actually valid.
+        data['poem_set-0-DELETE'] = 'on'
+        formset = PoemFormSet(data, instance=poet)
+        self.assertEqual(formset.is_valid(), True)
+        formset.save()
+        self.assertEqual(Poem.objects.count(), 0)