Commit dbe18ce5 authored by Karen Tracey's avatar Karen Tracey
Browse files

[1.0.X] Fixed #9592 -- Create data for the generic_inline_admin test during... 

[1.0.X] 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.

r9438 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9439 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 51dabd28

tests/regressiontests/generic_inline_admin/fixtures/model-data.xml

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
<?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

tests/regressiontests/generic_inline_admin/tests.py

+8 −1
Original line number Diff line number Diff line
@@ -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
@@ -17,6 +17,13 @@ class GenericAdminViewTest(TestCase): 
        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()

        settings.TEMPLATE_DEBUG = self.original_template_debug