Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar

1 files changed, 12 insertions, 3 deletions

diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index 9746dc3f6..61e7695f9 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -28,17 +28,26 @@ from django.test import TestCase
 from django.contrib.auth.models import User
 import models
 
+from ishtar_common.models import OrganizationType, Organization
+
 class ImportOperationTest(TestCase):
-    fixtures = ['../ishtar_commun/fixtures/initial_data.json',
+    fixtures = ['../ishtar_common/fixtures/initial_data.json',
                 '../archaeological_files/fixtures/initial_data.json',
-                '../archaeological_operations/fixtures/initial_data.json']
+                '../archaeological_operations/fixtures/initial_data-fr.json']
 
     def setUp(self):
         user = User.objects.create_user('username')
 
-    def testImportOperation(self):
+    def testImportDbfOperation(self):
         """
         Test operation import
         """
         call_command('import_operations', os.sep.join([os.getcwd(), '..',
                            'archaeological_operations', 'tests', 'sample.dbf']))
+
+    def testImportCsvOperation(self):
+        """
+        Test operation import
+        """
+        call_command('import_operations', os.sep.join([os.getcwd(), '..',
+                           'archaeological_operations', 'tests', 'sample.csv']))