summaryrefslogtreecommitdiff
path: root/archaeological_files
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-07-26 12:56:56 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-07-26 12:56:56 +0200
commit32d85d8604fbdf67644a406e265372e3bb4c8657 (patch)
treebea9c470a1d90ade512744f8579be99e9170b781 /archaeological_files
parent0f4440c057fa1adc3e6e3d94a80f4cbf6c95129c (diff)
downloadIshtar-32d85d8604fbdf67644a406e265372e3bb4c8657.tar.bz2
Ishtar-32d85d8604fbdf67644a406e265372e3bb4c8657.zip
Tests: fix fixtures management
Diffstat (limited to 'archaeological_files')
-rw-r--r--archaeological_files/tests.py23
1 files changed, 5 insertions, 18 deletions
diff --git a/archaeological_files/tests.py b/archaeological_files/tests.py
index 82f85e7c9..b23c91a95 100644
--- a/archaeological_files/tests.py
+++ b/archaeological_files/tests.py
@@ -25,12 +25,13 @@ from django.contrib.auth.models import User
from django.core.urlresolvers import reverse
from django.test.client import Client
-from ishtar_common.tests import TestCase
+from ishtar_common.tests import TestCase, COMMON_FIXTURES
from ishtar_common.models import PersonType, Town, IshtarSiteProfile
from archaeological_files import models
from archaeological_operations.models import Parcel, ParcelOwner
-from archaeological_operations.tests import OperationInitTest
+from archaeological_operations.tests import OperationInitTest, \
+ FILE_TOWNS_FIXTURES
class FileInit(object):
@@ -69,10 +70,7 @@ class FileInit(object):
class FileTest(TestCase, FileInit):
- fixtures = [settings.ROOT_PATH +
- '../fixtures/initial_data-auth-fr.json',
- settings.ROOT_PATH +
- '../ishtar_common/fixtures/initial_data-fr.json']
+ fixtures = COMMON_FIXTURES
model = models.File
def setUp(self):
@@ -241,18 +239,7 @@ class FileTest(TestCase, FileInit):
class FileOperationTest(TestCase, OperationInitTest, FileInit):
model = models.File
- fixtures = [settings.ROOT_PATH +
- '../fixtures/initial_data-auth-fr.json',
- settings.ROOT_PATH +
- '../ishtar_common/fixtures/initial_data-fr.json',
- settings.ROOT_PATH +
- '../ishtar_common/fixtures/test_towns.json',
- settings.ROOT_PATH +
- '../ishtar_common/fixtures/initial_importtypes-fr.json',
- settings.ROOT_PATH +
- '../archaeological_files/fixtures/initial_data.json',
- settings.ROOT_PATH +
- '../archaeological_operations/fixtures/initial_data-fr.json']
+ fixtures = FILE_TOWNS_FIXTURES
def setUp(self):
self.create_file()