diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-04-02 16:38:18 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-06-17 13:21:27 +0200 |
| commit | a55b290ed3745cefb82d189d8dc678c762301fa6 (patch) | |
| tree | c67ac8afe2228a572272dcebe8853d5d82bad9af /archaeological_context_records | |
| parent | 0c3b9124dc790efa6a5f7e3883d7a3e8a5708389 (diff) | |
| download | Ishtar-a55b290ed3745cefb82d189d8dc678c762301fa6.tar.bz2 Ishtar-a55b290ed3745cefb82d189d8dc678c762301fa6.zip | |
Tests: fix default conversion to str
Diffstat (limited to 'archaeological_context_records')
| -rw-r--r-- | archaeological_context_records/models.py | 2 | ||||
| -rw-r--r-- | archaeological_context_records/tests.py | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 35899668c..128342b57 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -520,7 +520,7 @@ class ContextRecord(BulkUpdatedItem, DocumentItem, BaseHistorizedItem, return pgettext("short", "Context record") def __str__(self): - return self.short_label + return self.short_label or "" def get_values(self, prefix='', no_values=False, no_base_finds=True): values = super(ContextRecord, self).get_values(prefix=prefix, diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py index aa98d83a8..764750cf6 100644 --- a/archaeological_context_records/tests.py +++ b/archaeological_context_records/tests.py @@ -293,6 +293,7 @@ class ContextRecordTest(ContextRecordInit, TestCase): cr.location = "I am heeere" cr.save() cr = models.ContextRecord.objects.get(pk=cr.pk) + self.assertIsNotNone(cr.search_vector) for key in ('label', 'heeer'): self.assertIn(key, cr.search_vector) cr.operation.code_patriarche = "PATRIARCHE" @@ -300,12 +301,14 @@ class ContextRecordTest(ContextRecordInit, TestCase): cr = models.ContextRecord.objects.get(pk=cr.pk) profile = get_current_profile() + self.assertIsNotNone(cr.cached_label) self.assertIn(profile.operation_prefix.lower() + "patriarch", cr.search_vector) def test_upstream_cache_update(self): cr = self.create_context_record()[0] cr_pk = cr.pk + self.assertIsNotNone(cr.cached_label) # OP2010 - 1 | A | 1 | CR 1 ope_id, parcel_sec, parcel_nb, cr_label = cr.cached_label.split(' | ') self.assertEqual(ope_id, 'OP2010-1') @@ -317,6 +320,7 @@ class ContextRecordTest(ContextRecordInit, TestCase): cr.label = new_lbl cr.save() cr = models.ContextRecord.objects.get(pk=cr_pk) + self.assertIsNotNone(cr.cached_label) ope_id, parcel_sec, parcel_nb, cr_label = cr.cached_label.split(' | ') self.assertEqual(cr_label, new_lbl) @@ -326,6 +330,7 @@ class ContextRecordTest(ContextRecordInit, TestCase): parcel.parcel_number = new_nb parcel.save() cr = models.ContextRecord.objects.get(pk=cr_pk) + self.assertIsNotNone(cr.cached_label) ope_id, parcel_sec, parcel_nb, cr_label = cr.cached_label.split(' | ') self.assertEqual(parcel_sec, new_sec) self.assertEqual(parcel_nb, new_nb) @@ -333,6 +338,7 @@ class ContextRecordTest(ContextRecordInit, TestCase): cr.operation.year = 2017 cr.operation.save() cr = models.ContextRecord.objects.get(pk=cr_pk) + self.assertIsNotNone(cr.cached_label) ope_id, parcel_sec, parcel_nb, cr_label = cr.cached_label.split(' | ') self.assertEqual(ope_id, 'OP2017-1') |