Merge branch 'master' into develop

1 files changed, 37 insertions, 69 deletions

diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py
index 75f580633..3f34ab495 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):
@@ -95,19 +111,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
@@ -126,6 +130,11 @@ class FindWizardCreationTest(WizardTest, FindInit, TestCase):
                         'period': None,
                         'start_date': '0',
                         'end_date': '200',
+                    },
+                    {
+                        'period': None,
+                        'start_date': '0',
+                        'end_date': '200',
                     }
                 ]
             },
@@ -138,8 +147,11 @@ class FindWizardCreationTest(WizardTest, FindInit, TestCase):
 
         self.form_datas[0].form_datas['selecrecord-find_creation']['pk'] = \
             cr.pk
+        period = Period.objects.all()[0].pk
         self.form_datas[0].form_datas['dating-find_creation'][0]['period'] = \
-            Period.objects.all()[0].pk
+            period
+        self.form_datas[0].form_datas['dating-find_creation'][1]['period'] = \
+            period
         self.find_number = models.Find.objects.count()
         self.basefind_number = models.BaseFind.objects.count()
         super(FindWizardCreationTest, self).pre_wizard()
@@ -149,12 +161,13 @@ class FindWizardCreationTest(WizardTest, FindInit, TestCase):
                          self.basefind_number + 1)
         self.assertEqual(models.Find.objects.count(),
                          self.find_number + 1)
-        find = models.Find.objects.order_by("-pk")[0]
-        self.assertEqual(find.datings.count(), 1)
+        # identical datings, only one should be finaly save
+        f = models.Find.objects.order_by("-pk").all()[0]
+        self.assertEqual(f.datings.count(), 1)
 
 
 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
@@ -185,19 +198,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
@@ -255,10 +256,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()
@@ -312,17 +310,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):
@@ -429,17 +417,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):
@@ -569,17 +547,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):