Merge branch 'master' into v0.9

Conflicts:
	ishtar_common/migrations/0053_auto__add_field_ishtarsiteprofile_currency.py

1 files changed, 52 insertions, 2 deletions

diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py
index c17e440b1..1b61d49ca 100644
--- a/archaeological_finds/tests.py
+++ b/archaeological_finds/tests.py
@@ -106,7 +106,8 @@ class FindInit(ContextRecordInit):
         default = {'label': "Base find"}
         if not data_base.get('history_modifier'):
             data_base['history_modifier'] = self.get_default_user()
-        if not data_base.get('context_record'):
+        if not data_base.get('context_record') \
+                or not data_base['context_record'].pk:
             data_base['context_record'] = self.get_default_context_record()
 
         default.update(data_base)
@@ -122,8 +123,57 @@ class FindInit(ContextRecordInit):
     def get_default_find(self):
         return self.create_finds()[0]
 
+    def tearDown(self):
+        super(FindInit, self).tearDown()
+        if hasattr(self, 'finds'):
+            for f in self.finds:
+                try:
+                    f.delete()
+                except:
+                    pass
+            self.finds = []
+        if hasattr(self, 'base_finds'):
+            for f in self.base_finds:
+                try:
+                    f.delete()
+                except:
+                    pass
+            self.base_find = []
+
+
+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',
+                ]
+    model = models.Find
+
+    def setUp(self):
+        self.create_finds()
+
+    def testExternalID(self):
+        find = self.finds[0]
+        base_find = find.base_finds.all()[0]
+        self.assertEqual(
+            find.external_id,
+            u"{}-{}".format(
+                find.get_first_base_find().context_record.external_id,
+                find.label))
+        self.assertEqual(
+            base_find.external_id,
+            u"{}-{}".format(
+                base_find.context_record.external_id,
+                base_find.label))
+
 
-class PackagingTest(TestCase, FindInit):
+class PackagingTest(FindInit, TestCase):
     fixtures = [settings.ROOT_PATH +
                 '../fixtures/initial_data.json',
                 settings.ROOT_PATH +