Merge branch 'master' into v0.9

1 files changed, 19 insertions, 12 deletions

diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py
index 0082624d7..a3fa62ce7 100644
--- a/ishtar_common/tests.py
+++ b/ishtar_common/tests.py
@@ -27,6 +27,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.cache import cache
 from django.core.exceptions import ValidationError
 from django.core.files.base import File as DjangoFile
+from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.management import call_command
 from django.core.urlresolvers import reverse
 from django.template.defaultfilters import slugify
@@ -35,6 +36,7 @@ from django.test.client import Client
 from django.test.simple import DjangoTestSuiteRunner
 
 from ishtar_common import models
+from ishtar_common import forms_common
 from ishtar_common.utils import post_save_point
 
 """
@@ -271,10 +273,12 @@ class AdminGenTypeTest(TestCase):
                 '../ishtar_common/fixtures/initial_importtypes-fr.json',
                 settings.ROOT_PATH +
                 '../archaeological_operations/fixtures/initial_data-fr.json']
-    models = [models.OrganizationType, models.PersonType, models.TitleType,
-              models.AuthorType, models.SourceType, models.OperationType,
-              models.SpatialReferenceSystem]
-    # models.Format, models.SupportType -- need fixtures
+    gen_models = [
+        models.OrganizationType, models.PersonType, models.TitleType,
+        models.AuthorType, models.SourceType, models.OperationType,
+        models.SpatialReferenceSystem, models.Format, models.SupportType]
+    models_with_data = gen_models + [models.ImporterModel]
+    models = models_with_data
     module_name = 'ishtar_common'
 
     def setUp(self):
@@ -294,14 +298,15 @@ class AdminGenTypeTest(TestCase):
             self.assertEqual(
                 response.status_code, 200,
                 msg="Can not access admin list for {}.".format(model))
-            url = base_url + "{}/".format(model.objects.all()[0].pk)
-            response = self.client.get(url)
-            self.assertEqual(
-                response.status_code, 200,
-                msg="Can not access admin detail for {}.".format(model))
+            if model in self.models_with_data:
+                url = base_url + "{}/".format(model.objects.all()[0].pk)
+                response = self.client.get(url)
+                self.assertEqual(
+                    response.status_code, 200,
+                    msg="Can not access admin detail for {}.".format(model))
 
     def test_csv_export(self):
-        for model in self.models:
+        for model in self.gen_models:
             url = '/admin/{}/{}/'.format(self.module_name,
                                          model.__name__.lower())
             response = self.client.post(url, {'action': 'export_as_csv'})
@@ -311,7 +316,7 @@ class AdminGenTypeTest(TestCase):
 
     def test_str(self):
         # test __str__
-        for model in self.models:
+        for model in self.models_with_data:
             self.assertTrue(str(model.objects.all()[0]))
 
 
@@ -768,8 +773,10 @@ class ImportTest(TestCase):
 
         # create an import, fields are not relevant...
         create_user()
+        imp_model = models.ImporterModel.objects.create(
+            klass='ishtar_common.models.Person', name='Person')
         importer_type = models.ImporterType.objects.create(
-            associated_models='ishtar_common.models.Person')
+            associated_models=imp_model)
         mcc_operation_file = DjangoFile(file(
             settings.ROOT_PATH +
             '../archaeological_operations/tests/MCC-operations-example.csv',