summaryrefslogtreecommitdiff
path: root/ishtar_common
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
commitcdec41e1a2af5fc2a3ab9ca8d3d4ad6fcab848c3 (patch)
treebea9c470a1d90ade512744f8579be99e9170b781 /ishtar_common
parent2eecea81d02e855bbec65e4213530e0d2737984e (diff)
downloadIshtar-cdec41e1a2af5fc2a3ab9ca8d3d4ad6fcab848c3.tar.bz2
Ishtar-cdec41e1a2af5fc2a3ab9ca8d3d4ad6fcab848c3.zip
Tests: fix fixtures management
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/tests.py26
1 files changed, 16 insertions, 10 deletions
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py
index 536d6d4a8..b862b4ea7 100644
--- a/ishtar_common/tests.py
+++ b/ishtar_common/tests.py
@@ -69,6 +69,21 @@ class OOOGenerationTest(TestCase):
"""
+COMMON_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/initial_spatialrefsystem-fr.json',
+ settings.ROOT_PATH +
+ '../ishtar_common/fixtures/initial_importtypes-fr.json',
+ ]
+
+OPERATION_FIXTURES = COMMON_FIXTURES + [
+ settings.ROOT_PATH +
+ '../archaeological_operations/fixtures/initial_data-fr.json'
+]
+
+
def create_superuser():
username = 'username4277'
password = 'dcbqj756456!@%'
@@ -337,16 +352,7 @@ class AccessControlTest(TestCase):
class AdminGenTypeTest(TestCase):
- 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/initial_spatialrefsystem-fr.json',
- settings.ROOT_PATH +
- '../ishtar_common/fixtures/initial_importtypes-fr.json',
- settings.ROOT_PATH +
- '../archaeological_operations/fixtures/initial_data-fr.json']
+ fixtures = OPERATION_FIXTURES
gen_models = [
models.OrganizationType, models.PersonType, models.TitleType,
models.AuthorType, models.SourceType, models.OperationType,