From 75302ff6355ab770a1791b55eaf4a476bcc76d99 Mon Sep 17 00:00:00 2001 From: Paul McMillan Date: Wed, 9 Jun 2010 22:33:19 +0000 Subject: [soc2010/test-refactor] Renamed choices test fixture to be semantically meaningful. git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13345 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../modeltests/choices/fixtures/choices_testdata.json | 18 ++++++++++++++++++ tests/modeltests/choices/fixtures/initial_data.json | 18 ------------------ tests/modeltests/choices/tests.py | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 tests/modeltests/choices/fixtures/choices_testdata.json delete mode 100644 tests/modeltests/choices/fixtures/initial_data.json diff --git a/tests/modeltests/choices/fixtures/choices_testdata.json b/tests/modeltests/choices/fixtures/choices_testdata.json new file mode 100644 index 0000000000..e8236ce7c8 --- /dev/null +++ b/tests/modeltests/choices/fixtures/choices_testdata.json @@ -0,0 +1,18 @@ +[ + { + "pk": 1, + "model": "choices.person", + "fields": { + "gender": "M", + "name": "Adrian" + } + }, + { + "pk": 2, + "model": "choices.person", + "fields": { + "gender": "F", + "name": "Sara" + } + } +] \ No newline at end of file diff --git a/tests/modeltests/choices/fixtures/initial_data.json b/tests/modeltests/choices/fixtures/initial_data.json deleted file mode 100644 index e8236ce7c8..0000000000 --- a/tests/modeltests/choices/fixtures/initial_data.json +++ /dev/null @@ -1,18 +0,0 @@ -[ - { - "pk": 1, - "model": "choices.person", - "fields": { - "gender": "M", - "name": "Adrian" - } - }, - { - "pk": 2, - "model": "choices.person", - "fields": { - "gender": "F", - "name": "Sara" - } - } -] \ No newline at end of file diff --git a/tests/modeltests/choices/tests.py b/tests/modeltests/choices/tests.py index ed593a9108..ac130e5754 100644 --- a/tests/modeltests/choices/tests.py +++ b/tests/modeltests/choices/tests.py @@ -3,7 +3,7 @@ from django.test import TestCase from models import Person class ChoicesFieldTestCase(TestCase): - fixtures = ['initial_data.json'] + fixtures = ['choices_testdata.json'] def setUp(self): self.a = Person.objects.get(name='Adrian') -- cgit v1.3