Commit d9b9684e authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.2.X] Fixed #15549 -- Removed dependency on specific primary keys. Thanks to... 

[1.2.X] Fixed #15549 -- Removed dependency on specific primary keys. Thanks to bberes for the report.

Backport of r15744 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15747 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent a1697e88

tests/regressiontests/model_formsets_regress/tests.py

+15 −11
Original line number Diff line number Diff line
@@ -329,14 +329,6 @@ class FormfieldShouldDeleteFormTests(TestCase): 
            'form-3-serial': '5',

            }



    bound_ids = {

            'form-INITIAL_FORMS': '4',

            'form-0-id': '1',

            'form-1-id': '2',

            'form-2-id': '3',

            'form-3-id': '4',

            }



    delete_all_ids = {

            'form-0-DELETE': '1',

            'form-1-DELETE': '1',
@@ -357,7 +349,11 @@ class FormfieldShouldDeleteFormTests(TestCase): 


        # pass standard data dict & see none updated

        data = dict(self.data)

        data.update(self.bound_ids)

        data['form-INITIAL_FORMS'] = 4

        data.update(dict(

            ('form-%d-id' % i, user.id)

            for i,user in enumerate(User.objects.all())

        ))

        formset = self.NormalFormset(data, queryset=User.objects.all())

        self.assertTrue(formset.is_valid())

        self.assertEqual(len(formset.save()), 0)
@@ -370,7 +366,11 @@ class FormfieldShouldDeleteFormTests(TestCase): 


        # create data dict with all fields marked for deletion

        data = dict(self.data)

        data.update(self.bound_ids)

        data['form-INITIAL_FORMS'] = 4

        data.update(dict(

            ('form-%d-id' % i, user.id)

            for i,user in enumerate(User.objects.all())

        ))

        data.update(self.delete_all_ids)

        formset = self.NormalFormset(data, queryset=User.objects.all())

        self.assertTrue(formset.is_valid())
@@ -385,7 +385,11 @@ class FormfieldShouldDeleteFormTests(TestCase): 
        # Create formset with custom Delete function

        # create data dict with all fields marked for deletion

        data = dict(self.data)

        data.update(self.bound_ids)

        data['form-INITIAL_FORMS'] = 4

        data.update(dict(

            ('form-%d-id' % i, user.id)

            for i,user in enumerate(User.objects.all())

        ))

        data.update(self.delete_all_ids)

        formset = self.DeleteFormset(data, queryset=User.objects.all())