diff options
Diffstat (limited to 'tests/regressiontests/generic_inline_admin')
| -rw-r--r-- | tests/regressiontests/generic_inline_admin/models.py | 5 | ||||
| -rw-r--r-- | tests/regressiontests/generic_inline_admin/tests.py | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tests/regressiontests/generic_inline_admin/models.py b/tests/regressiontests/generic_inline_admin/models.py index 329c4877eb..fb6363e2bb 100644 --- a/tests/regressiontests/generic_inline_admin/models.py +++ b/tests/regressiontests/generic_inline_admin/models.py @@ -76,11 +76,15 @@ admin.site.register(EpisodeExclude, inlines=[MediaExcludeInline]) # Generic inline with unique_together # +class Category(models.Model): + name = models.CharField(max_length=50) + class PhoneNumber(models.Model): content_type = models.ForeignKey(ContentType) object_id = models.PositiveIntegerField() content_object = generic.GenericForeignKey('content_type', 'object_id') phone_number = models.CharField(max_length=30) + category = models.ForeignKey(Category, null=True, blank=True) class Meta: unique_together = (('content_type', 'object_id', 'phone_number',),) @@ -93,6 +97,7 @@ class PhoneNumberInline(generic.GenericTabularInline): model = PhoneNumber admin.site.register(Contact, inlines=[PhoneNumberInline]) +admin.site.register(Category) # # Generic inline with can_delete=False diff --git a/tests/regressiontests/generic_inline_admin/tests.py b/tests/regressiontests/generic_inline_admin/tests.py index 0626699292..f0e8f3e558 100644 --- a/tests/regressiontests/generic_inline_admin/tests.py +++ b/tests/regressiontests/generic_inline_admin/tests.py @@ -6,7 +6,7 @@ from django.contrib.contenttypes.generic import generic_inlineformset_factory # local test models from models import Episode, EpisodeExtra, EpisodeMaxNum, EpisodeExclude, \ - Media, EpisodePermanent, MediaPermanentInline + Media, EpisodePermanent, MediaPermanentInline, Category class GenericAdminViewTest(TestCase): fixtures = ['users.xml'] @@ -190,6 +190,7 @@ class GenericInlineAdminWithUniqueTogetherTest(TestCase): self.client.logout() def testAdd(self): + category_id = Category.objects.create(name='male').pk post_data = { "name": u"John Doe", # inline data @@ -198,8 +199,10 @@ class GenericInlineAdminWithUniqueTogetherTest(TestCase): "generic_inline_admin-phonenumber-content_type-object_id-MAX_NUM_FORMS": u"0", "generic_inline_admin-phonenumber-content_type-object_id-0-id": "", "generic_inline_admin-phonenumber-content_type-object_id-0-phone_number": "555-555-5555", + "generic_inline_admin-phonenumber-content_type-object_id-0-category": "%s" % category_id, } response = self.client.get('/generic_inline_admin/admin/generic_inline_admin/contact/add/') + self.failUnlessEqual(response.status_code, 200) response = self.client.post('/generic_inline_admin/admin/generic_inline_admin/contact/add/', post_data) self.failUnlessEqual(response.status_code, 302) # redirect somewhere |