diff options
Diffstat (limited to 'archaeological_finds/tests.py')
| -rw-r--r-- | archaeological_finds/tests.py | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index 1843ff094..a4a1ad471 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -29,7 +29,7 @@ from ishtar_common.models import ImporterType, IshtarUser, ImporterColumn,\ FormaterType, ImportTarget, IshtarSiteProfile, ProfileType from ishtar_common.models import Person, get_current_profile, UserProfile, \ - Town, Area, IshtarImage + Town, Area, Document from archaeological_context_records.models import Period, Dating, ContextRecord from archaeological_finds import models, views from archaeological_warehouse.models import Warehouse, WarehouseType @@ -277,7 +277,7 @@ class ImportFindTest(ImportTest, TestCase): importer_type_id=MCC.pk) formater = FormaterType.objects.filter( formater_type='FileFormater').all()[0] - ImportTarget.objects.create(target='images__image', + ImportTarget.objects.create(target='documents__image', formater_type_id=formater.pk, column_id=col.pk) mcc_file = open( @@ -636,21 +636,18 @@ class FindSearchTest(FindInit, TestCase): def test_image_search(self): c = Client() c.login(username=self.username, password=self.password) - search = {'images__pk__isnull': 2} # 2 for nullboolfield is None + search = {'documents__image__isnull': 2} # 2 for nullboolfield is None response = c.get(reverse('get-find'), search) self.assertEqual(response.status_code, 200) res = json.loads(response.content) self.assertEqual(res['recordsTotal'], 0) # add an image to the first find - image = IshtarImage.objects.create(name="Image!") + image = Document.objects.create(title="Image!") img = settings.ROOT_PATH + \ '../ishtar_common/static/media/images/ishtar-bg.jpg' image.image.save('ishtar-bg.jpg', File(open(img))) - models.FindImage.objects.create( - item=self.finds[0], - image=image - ) + self.finds[0].documents.add(image) self.finds[0].save() response = c.get(reverse('get-find'), search) self.assertEqual(response.status_code, 200) @@ -738,12 +735,9 @@ class PackagingTest(FindInit, TestCase): self.create_finds(data_base={"label": u"Find 1"}, force=True) self.create_finds(data_base={"label": u"Find 2"}, force=True) - image = IshtarImage.objects.create(name="Image!") + image = Document.objects.create(title="Image!") image.image.save('ishtar-bg.jpg', File(open(img))) - models.FindImage.objects.create( - item=self.finds[0], - image=image - ) + self.finds[0].documents.add(image) self.finds[0].save() self.basket = models.FindBasket.objects.create( @@ -776,8 +770,8 @@ class PackagingTest(FindInit, TestCase): # image names used to be altered on save: check for this bug self.assertEqual( - resulting_find.images.all()[0].name, - models.Find.objects.get(pk=first_find.pk).images.all()[0].name + resulting_find.documents.all()[0].title, + models.Find.objects.get(pk=first_find.pk).documents.all()[0].title ) # new version of the find is in the basket |