diff options
Diffstat (limited to 'ishtar_common/tests.py')
| -rw-r--r-- | ishtar_common/tests.py | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index 0082624d7..a2d7bf46c 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -271,10 +271,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, + gen_models = [models.OrganizationType, models.PersonType, models.TitleType, models.AuthorType, models.SourceType, models.OperationType, models.SpatialReferenceSystem] # models.Format, models.SupportType -- need fixtures + models_with_data = gen_models # + [models.ImporterModel] + models = models_with_data module_name = 'ishtar_common' def setUp(self): @@ -294,14 +296,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 +314,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 +771,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', |