Fixture re-organization.

* Added project-level fixture dirs to settings file; * Moved ``<app_name>/fixtures/*`` to ``fixture/<app_name>/*`` (IMHO, project-level fixtures are better since they reduce application coupling); * renamed ``import`` fixture to more descriptive ``test_data``.
feroda · Sep 22, 2011 · f6c2e7a · f6c2e7a
1 parent 7ae2374
commit f6c2e7a
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 0 deletions.
diff --git a/gasistafelice/default_settings.py b/gasistafelice/default_settings.py
@@ -119,6 +119,14 @@
 
 )
 
+FIXTURE_DIRS = (
+    os.path.join(PROJECT_ROOT, 'fixtures/auth/'),
+    os.path.join(PROJECT_ROOT, 'fixtures/base/'),
+    os.path.join(PROJECT_ROOT, 'fixtures/des/'),
+    os.path.join(PROJECT_ROOT, 'fixtures/gas/'),
+    os.path.join(PROJECT_ROOT, 'fixtures/supplier/'),
+)
+
 THEME = "milky"
 AUTH_PROFILE_MODULE = 'users.UserProfile'
 URL_PREFIX = "gasistafelice/"

diff --git a/...stafelice/auth/fixtures/initial_data.json → ...stafelice/fixtures/auth/initial_data.json b/...stafelice/auth/fixtures/initial_data.json → ...stafelice/fixtures/auth/initial_data.json
diff --git a/gasistafelice/auth/fixtures/import.json → gasistafelice/fixtures/auth/test_data.json b/gasistafelice/auth/fixtures/import.json → gasistafelice/fixtures/auth/test_data.json
diff --git a/gasistafelice/base/fixtures/import.json → gasistafelice/fixtures/base/test_data.json b/gasistafelice/base/fixtures/import.json → gasistafelice/fixtures/base/test_data.json
diff --git a/gasistafelice/des/fixtures/initial_data.json → gasistafelice/fixtures/des/initial_data.json b/gasistafelice/des/fixtures/initial_data.json → gasistafelice/fixtures/des/initial_data.json
diff --git a/gasistafelice/gas/fixtures/import.json → gasistafelice/fixtures/gas/test_data.json b/gasistafelice/gas/fixtures/import.json → gasistafelice/fixtures/gas/test_data.json
diff --git a/...elice/supplier/fixtures/initial_data.json → ...elice/fixtures/supplier/initial_data.json b/...elice/supplier/fixtures/initial_data.json → ...elice/fixtures/supplier/initial_data.json
diff --git a/gasistafelice/supplier/fixtures/import.json → ...tafelice/fixtures/supplier/test_data.json b/gasistafelice/supplier/fixtures/import.json → ...tafelice/fixtures/supplier/test_data.json