Merge branch 'master' into v0.9

1 files changed, 24 insertions, 63 deletions

diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index 2cb6dd035..a475667b1 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -37,7 +37,19 @@ from archaeological_context_records.models import Unit
 
 from ishtar_common import forms_common
 from ishtar_common.tests import WizardTest, WizardTestFormData as FormData, \
-    create_superuser, create_user, TestCase
+    create_superuser, create_user, TestCase, OPERATION_FIXTURES
+
+OPERATION_TOWNS_FIXTURES = \
+    OPERATION_FIXTURES + \
+    [settings.ROOT_PATH + '../ishtar_common/fixtures/test_towns.json']
+
+FILE_FIXTURES = OPERATION_FIXTURES + [
+    settings.ROOT_PATH +
+    '../archaeological_files/fixtures/initial_data.json']
+
+FILE_TOWNS_FIXTURES = OPERATION_TOWNS_FIXTURES + [
+    settings.ROOT_PATH +
+    '../archaeological_files/fixtures/initial_data.json']
 
 
 class ImportTest(object):
@@ -154,16 +166,7 @@ class ImportTest(object):
 
 
 class ImportOperationTest(ImportTest, 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/test_towns.json',
-                settings.ROOT_PATH +
-                '../ishtar_common/fixtures/initial_importtypes-fr.json',
-                settings.ROOT_PATH +
-                '../archaeological_operations/fixtures/initial_data-fr.json']
+    fixtures = OPERATION_TOWNS_FIXTURES
 
     def test_mcc_import_operation(self):
         first_ope_nb = models.Operation.objects.count()
@@ -337,16 +340,7 @@ class ImportOperationTest(ImportTest, TestCase):
 
 
 class ParcelTest(ImportTest, 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/test_towns.json',
-                settings.ROOT_PATH +
-                '../ishtar_common/fixtures/initial_importtypes-fr.json',
-                settings.ROOT_PATH +
-                '../archaeological_operations/fixtures/initial_data-fr.json']
+    fixtures = OPERATION_TOWNS_FIXTURES
 
     def test_parse_parcels(self):
         # the database needs to be initialised before importing
@@ -689,14 +683,7 @@ class OperationInitTest(object):
 
 
 class OperationTest(TestCase, OperationInitTest):
-    fixtures = [settings.ROOT_PATH +
-                '../fixtures/initial_data-auth-fr.json',
-                settings.ROOT_PATH +
-                '../ishtar_common/fixtures/initial_data-fr.json',
-                settings.ROOT_PATH +
-                '../archaeological_files/fixtures/initial_data.json',
-                settings.ROOT_PATH +
-                '../archaeological_operations/fixtures/initial_data-fr.json']
+    fixtures = FILE_FIXTURES
 
     def setUp(self):
         IshtarSiteProfile.objects.get_or_create(
@@ -890,14 +877,7 @@ class OperationTest(TestCase, OperationInitTest):
 
 
 class OperationSearchTest(TestCase, OperationInitTest):
-    fixtures = [settings.ROOT_PATH +
-                '../fixtures/initial_data-auth-fr.json',
-                settings.ROOT_PATH +
-                '../ishtar_common/fixtures/initial_data-fr.json',
-                settings.ROOT_PATH +
-                '../archaeological_files/fixtures/initial_data.json',
-                settings.ROOT_PATH +
-                '../archaeological_operations/fixtures/initial_data-fr.json']
+    fixtures = FILE_FIXTURES
 
     def setUp(self):
         IshtarSiteProfile.objects.get_or_create(
@@ -1011,12 +991,7 @@ def create_administrativact(user, operation):
 
 
 class RegisterTest(TestCase, OperationInitTest):
-    fixtures = [settings.ROOT_PATH +
-                '../ishtar_common/fixtures/initial_data.json',
-                settings.ROOT_PATH +
-                '../archaeological_files/fixtures/initial_data.json',
-                settings.ROOT_PATH +
-                '../archaeological_operations/fixtures/initial_data-fr.json']
+    fixtures = FILE_FIXTURES
 
     def setUp(self):
         self.username, self.password, self.user = create_superuser()
@@ -1037,14 +1012,7 @@ class RegisterTest(TestCase, OperationInitTest):
 
 
 class OperationWizardCreationTest(WizardTest, OperationInitTest, TestCase):
-    fixtures = [settings.ROOT_PATH +
-                '../fixtures/initial_data-auth-fr.json',
-                settings.ROOT_PATH +
-                '../ishtar_common/fixtures/initial_data-fr.json',
-                settings.ROOT_PATH +
-                '../archaeological_files/fixtures/initial_data.json',
-                settings.ROOT_PATH +
-                '../archaeological_operations/fixtures/initial_data-fr.json']
+    fixtures = FILE_FIXTURES
     url_name = 'operation_creation'
     wizard_name = 'operation_wizard'
     steps = views.wizard_steps
@@ -1113,7 +1081,7 @@ class OperationWizardCreationTest(WizardTest, OperationInitTest, TestCase):
 
 
 class OperationWizardModifTest(WizardTest, OperationInitTest, TestCase):
-    fixtures = OperationWizardCreationTest.fixtures
+    fixtures = FILE_FIXTURES
     url_name = 'operation_modification'
     wizard_name = url_name + '_wizard'
     steps = views.operation_modif_wizard_steps
@@ -1265,7 +1233,7 @@ class OperationWizardModifTest(WizardTest, OperationInitTest, TestCase):
 
 
 class OperationWizardDeleteTest(OperationWizardCreationTest):
-    fixtures = OperationWizardCreationTest.fixtures
+    fixtures = FILE_FIXTURES
     url_name = 'operation_deletion'
     wizard_name = 'operation_deletion_wizard'
     steps = views.operation_deletion_steps
@@ -1300,7 +1268,7 @@ class OperationWizardDeleteTest(OperationWizardCreationTest):
 
 
 class OperationWizardClosingTest(OperationWizardCreationTest):
-    fixtures = OperationWizardCreationTest.fixtures
+    fixtures = FILE_FIXTURES
     url_name = 'operation_closing'
     wizard_name = 'operation_closing_wizard'
     steps = views.operation_closing_steps
@@ -1332,14 +1300,7 @@ class OperationWizardClosingTest(OperationWizardCreationTest):
 
 class OperationAdminActWizardCreationTest(WizardTest, OperationInitTest,
                                           TestCase):
-    fixtures = [settings.ROOT_PATH +
-                '../fixtures/initial_data-auth-fr.json',
-                settings.ROOT_PATH +
-                '../ishtar_common/fixtures/initial_data-fr.json',
-                settings.ROOT_PATH +
-                '../archaeological_files/fixtures/initial_data.json',
-                settings.ROOT_PATH +
-                '../archaeological_operations/fixtures/initial_data-fr.json']
+    fixtures = FILE_FIXTURES
     url_name = 'operation_administrativeactop'
     wizard_name = 'operation_administrative_act_wizard'
     steps = views.administrativeactop_steps
@@ -1374,7 +1335,7 @@ class OperationAdminActWizardCreationTest(WizardTest, OperationInitTest,
 
 class OperationSourceWizardModificationTest(WizardTest, OperationInitTest,
                                             TestCase):
-    fixtures = OperationWizardCreationTest.fixtures
+    fixtures = FILE_FIXTURES
     url_name = 'operation_source_modification'
     wizard_name = 'operation_source_wizard'
     steps = views.operation_source_modification_steps