1 files changed, 25 insertions, 66 deletions
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py
index 86c7936ba..f8f134c0a 100644
--- a/archaeological_finds/tests.py
+++ b/archaeological_finds/tests.py
@@ -38,8 +38,24 @@ from ishtar_common import forms_common
 from ishtar_common.tests import WizardTest, WizardTestFormData as FormData, \
     TestCase
 from archaeological_operations.tests import ImportTest
-from archaeological_context_records.tests import ImportContextRecordTest, \
-    ContextRecordInit
+from archaeological_context_records.tests import ContextRecordInit, \
+    CONTEXT_RECORD_FIXTURES, CONTEXT_RECORD_TOWNS_FIXTURES
+
+
+FIND_FIXTURES = CONTEXT_RECORD_FIXTURES + [
+    settings.ROOT_PATH +
+    '../archaeological_finds/fixtures/initial_data-fr.json',
+]
+
+FIND_TOWNS_FIXTURES = CONTEXT_RECORD_TOWNS_FIXTURES + [
+    settings.ROOT_PATH +
+    '../archaeological_finds/fixtures/initial_data-fr.json',
+]
+
+WAREHOUSE_FIXTURES = FIND_FIXTURES + [
+    settings.ROOT_PATH +
+    '../archaeological_warehouse/fixtures/initial_data-fr.json',
+]
 
 
 class FindInit(ContextRecordInit):
@@ -92,19 +108,7 @@ class FindInit(ContextRecordInit):
 
 
 class FindWizardCreationTest(WizardTest, FindInit, TestCase):
-    fixtures = [settings.ROOT_PATH +
-                '../fixtures/initial_data.json',
-                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',
-                settings.ROOT_PATH +
-                '../archaeological_finds/fixtures/initial_data-fr.json',
-                settings.ROOT_PATH +
-                '../archaeological_warehouse/fixtures/initial_data-fr.json',
-                ]
+    fixtures = WAREHOUSE_FIXTURES
     url_name = 'find_creation'
     wizard_name = 'find_wizard'
     steps = views.find_creation_steps
@@ -160,7 +164,7 @@ class FindWizardCreationTest(WizardTest, FindInit, TestCase):
 
 
 class FindWizardDeletionWithWarehouseModTest(WizardTest, FindInit, TestCase):
-    fixtures = FindWizardCreationTest.fixtures
+    fixtures = WAREHOUSE_FIXTURES
     url_name = 'find_deletion'
     wizard_name = 'find_deletion_wizard'
     steps = views.find_deletion_steps
@@ -191,19 +195,7 @@ class FindWizardDeletionWithWarehouseModTest(WizardTest, FindInit, TestCase):
 
 
 class TreatmentWizardCreationTest(WizardTest, FindInit, TestCase):
-    fixtures = [settings.ROOT_PATH +
-                '../fixtures/initial_data.json',
-                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',
-                settings.ROOT_PATH +
-                '../archaeological_finds/fixtures/initial_data-fr.json',
-                settings.ROOT_PATH +
-                '../archaeological_warehouse/fixtures/initial_data-fr.json',
-                ]
+    fixtures = WAREHOUSE_FIXTURES
     url_name = 'treatment_creation'
     wizard_name = 'treatment_wizard'
     steps = views.treatment_wizard_steps
@@ -261,10 +253,7 @@ class TreatmentWizardCreationTest(WizardTest, FindInit, TestCase):
 
 
 class ImportFindTest(ImportTest, TestCase):
-    fixtures = ImportContextRecordTest.fixtures + [
-        settings.ROOT_PATH +
-        '../archaeological_finds/fixtures/initial_data-fr.json',
-    ]
+    fixtures = FIND_TOWNS_FIXTURES
 
     def test_mcc_import_finds(self):
         self.init_context_record()
@@ -318,17 +307,7 @@ class ImportFindTest(ImportTest, TestCase):
 
 
 class FindTest(FindInit, TestCase):
-    fixtures = [settings.ROOT_PATH +
-                '../fixtures/initial_data.json',
-                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',
-                settings.ROOT_PATH +
-                '../archaeological_finds/fixtures/initial_data-fr.json',
-                ]
+    fixtures = FIND_FIXTURES
     model = models.Find
 
     def setUp(self):
@@ -435,17 +414,7 @@ class FindTest(FindInit, TestCase):
 
 
 class FindSearchTest(FindInit, TestCase):
-    fixtures = [settings.ROOT_PATH +
-                '../fixtures/initial_data.json',
-                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',
-                settings.ROOT_PATH +
-                '../archaeological_finds/fixtures/initial_data-fr.json',
-                ]
+    fixtures = FIND_FIXTURES
     model = models.Find
 
     def setUp(self):
@@ -575,17 +544,7 @@ class FindSearchTest(FindInit, TestCase):
 
 
 class PackagingTest(FindInit, TestCase):
-    fixtures = [settings.ROOT_PATH +
-                '../fixtures/initial_data.json',
-                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',
-                settings.ROOT_PATH +
-                '../archaeological_finds/fixtures/initial_data-fr.json',
-                ]
+    fixtures = FIND_FIXTURES
     model = models.Find
 
     def setUp(self):