diff options
| author | Karen Tracey <kmtracey@gmail.com> | 2008-11-14 14:47:46 +0000 |
|---|---|---|
| committer | Karen Tracey <kmtracey@gmail.com> | 2008-11-14 14:47:46 +0000 |
| commit | 02e67bba4742e5024c843cb96da618b8e5fdf5da (patch) | |
| tree | 08eac061335f5670a763d957ffc9e4fa580f4ad3 /tests/regressiontests | |
| parent | 64b56447f36dc45ceb56ba7af84259f7004ae4bc (diff) | |
Fixed #9592 -- Create data for the generic_inline_admin test during setup instead of via a fixutre since it uses a content type id which will vary depending on what other tests have been run.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9438 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests')
| -rw-r--r-- | tests/regressiontests/generic_inline_admin/fixtures/model-data.xml | 11 | ||||
| -rw-r--r-- | tests/regressiontests/generic_inline_admin/tests.py | 9 |
2 files changed, 8 insertions, 12 deletions
diff --git a/tests/regressiontests/generic_inline_admin/fixtures/model-data.xml b/tests/regressiontests/generic_inline_admin/fixtures/model-data.xml deleted file mode 100644 index a629208d2d..0000000000 --- a/tests/regressiontests/generic_inline_admin/fixtures/model-data.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<django-objects version="1.0"> - <object pk="1" model="generic_inline_admin.Episode"> - <field type="CharField" name="name">This Week in Django</field> - </object> - <object pk="1" model="generic_inline_admin.Media"> - <field type="ForeignKey" name="content_type">13</field> - <field type="PositiveIntegerField" name="object_id">1</field> - <field type="URLField" name="url">http://example.com/podcast.mp3</field> - </object> -</django-objects>
\ No newline at end of file diff --git a/tests/regressiontests/generic_inline_admin/tests.py b/tests/regressiontests/generic_inline_admin/tests.py index f2953fee54..e03cc1f2f4 100644 --- a/tests/regressiontests/generic_inline_admin/tests.py +++ b/tests/regressiontests/generic_inline_admin/tests.py @@ -7,7 +7,7 @@ from django.conf import settings from models import Episode, Media class GenericAdminViewTest(TestCase): - fixtures = ['users.xml', 'model-data.xml'] + fixtures = ['users.xml'] def setUp(self): # set TEMPLATE_DEBUG to True to ensure {% include %} will raise @@ -16,6 +16,13 @@ class GenericAdminViewTest(TestCase): self.original_template_debug = settings.TEMPLATE_DEBUG settings.TEMPLATE_DEBUG = True self.client.login(username='super', password='secret') + + # Can't load content via a fixture (since the GenericForeignKey + # relies on content type IDs, which will vary depending on what + # other tests have been run), thus we do it here. + e = Episode.objects.create(name='This Week in Django') + m = Media(content_object=e, url='http://example.com/podcast.mp3') + m.save() def tearDown(self): self.client.logout() |