Commit fb7ab773 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Changed the fixtures used to test the 'initial_data' feature so they don't... 

Changed the fixtures used to test the 'initial_data' feature so they don't contain datetimes. Refs #17275.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17154 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 02bc523b

tests/modeltests/fixtures/fixtures/initial_data.json

+4 −5
Original line number Diff line number Diff line 
[

    {

        "pk": "1", 

        "model": "fixtures.article", 

        "pk": "10",

        "model": "fixtures.book",

        "fields": {

            "headline": "Python program becomes self aware", 

            "pub_date": "2006-06-16 11:00:00"

            "name": "Achieving self-awareness of Python programs"

        }

    }

]

tests/modeltests/fixtures/models.py

+2 −2
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ class Book(models.Model): 
    authors = models.ManyToManyField(Person)



    def __unicode__(self):

        return '%s by %s' % (self.name,

                          ' and '.join(a.name for a in self.authors.all()))

        authors = ' and '.join(a.name for a in self.authors.all())

        return '%s by %s' % (self.name, authors) if authors else self.name



    class Meta:

        ordering = ('name',)

tests/modeltests/fixtures/tests.py

+27 −43

File changed.

Preview size limit exceeded, changes collapsed.

tests/modeltests/fixtures_model_package/fixtures/initial_data.json

+3 −4
Original line number Diff line number Diff line 
[

    {

        "pk": "1", 

        "model": "fixtures_model_package.article", 

        "pk": "10",

        "model": "fixtures_model_package.book",

        "fields": {

            "headline": "Python program becomes self aware", 

            "pub_date": "2006-06-16 11:00:00"

            "name": "Achieving self-awareness of Python programs"

        }

    }

]

tests/modeltests/fixtures_model_package/models/__init__.py

+5 −0
Original line number Diff line number Diff line
@@ -12,3 +12,8 @@ class Article(models.Model): 
        app_label = 'fixtures_model_package'

        ordering = ('-pub_date', 'headline')



class Book(models.Model):

    name = models.CharField(max_length=100)



    class Meta:

        ordering = ('name',)