mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 02:09:13 +00:00
Code Issues 32 Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Russell Keith-Magee 2011-03-04 00:42:21 +00:00
parent a1697e883a
commit d9b9684eff
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/regressiontests/model_formsets_regress/tests.py
View File

@ -329,14 +329,6 @@ class FormfieldShouldDeleteFormTests(TestCase):
'form-3-serial': '5', '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 = { delete_all_ids = {
'form-0-DELETE': '1', 'form-0-DELETE': '1',
'form-1-DELETE': '1', 'form-1-DELETE': '1',
@ -357,7 +349,11 @@ class FormfieldShouldDeleteFormTests(TestCase):
# pass standard data dict & see none updated # pass standard data dict & see none updated
data = dict(self.data) 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()) formset = self.NormalFormset(data, queryset=User.objects.all())
self.assertTrue(formset.is_valid()) self.assertTrue(formset.is_valid())
self.assertEqual(len(formset.save()), 0) self.assertEqual(len(formset.save()), 0)
@ -370,7 +366,11 @@ class FormfieldShouldDeleteFormTests(TestCase):
# create data dict with all fields marked for deletion # create data dict with all fields marked for deletion
data = dict(self.data) 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) data.update(self.delete_all_ids)
formset = self.NormalFormset(data, queryset=User.objects.all()) formset = self.NormalFormset(data, queryset=User.objects.all())
self.assertTrue(formset.is_valid()) self.assertTrue(formset.is_valid())
@ -385,7 +385,11 @@ class FormfieldShouldDeleteFormTests(TestCase):
# Create formset with custom Delete function # Create formset with custom Delete function
# create data dict with all fields marked for deletion # create data dict with all fields marked for deletion
data = dict(self.data) 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) data.update(self.delete_all_ids)
formset = self.DeleteFormset(data, queryset=User.objects.all()) formset = self.DeleteFormset(data, queryset=User.objects.all())