summaryrefslogtreecommitdiff
path: root/archaeological_finds/tests.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-12-11 20:39:26 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-12-11 20:39:26 +0100
commit68427dd44be65b6e62bf222565198713ed1d664b (patch)
tree9ac35e081a2e42e3d3eede0fc0ffaca35dae8632 /archaeological_finds/tests.py
parentb228ed1e8b626641a1429d2068b702597bf8aa0d (diff)
downloadIshtar-68427dd44be65b6e62bf222565198713ed1d664b.tar.bz2
Ishtar-68427dd44be65b6e62bf222565198713ed1d664b.zip
Fix tests for treatments
Diffstat (limited to 'archaeological_finds/tests.py')
-rw-r--r--archaeological_finds/tests.py61
1 files changed, 51 insertions, 10 deletions
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py
index f609fff47..ae03b2ba4 100644
--- a/archaeological_finds/tests.py
+++ b/archaeological_finds/tests.py
@@ -242,6 +242,13 @@ class TreatmentWizardCreationTest(WizardTest, FindInit, TestCase):
trt_type = models.TreatmentType.objects.get(txt_idx='moving')
self.form_datas[0].set('basetreatment', 'treatment_type', trt_type.pk)
+ completed, created = models.TreatmentState.objects.get_or_create(
+ txt_idx='completed', defaults={"executed": True, "label": u"Done"}
+ )
+ completed.executed = True
+ completed.save()
+
+ self.form_datas[0].set('basetreatment', 'treatment_state', completed.pk)
self.find, base_find = self.get_default_find(force=True)
self.form_datas[0].form_datas['selecfind'][
@@ -844,11 +851,18 @@ class TreatmentTest(FindInit, TestCase):
first_find = self.finds[0]
- treatment.save(user=self.get_default_user(), items=self.basket,
- treatment_type_list=[treatment_type])
- treatment.treatment_types.add(treatment_type)
-
+ completed, created = models.TreatmentState.objects.get_or_create(
+ txt_idx='completed', defaults={"executed": True, "label": u"Done"}
+ )
+ completed.executed = True
+ completed.save()
+ treatment.treatment_state = completed
+ treatment.save(
+ user=self.get_default_user(), items=self.basket,
+ treatment_type_list=[treatment_type],
+ )
+ treatment.treatment_types.add(treatment_type)
self.assertEqual(items_nb + self.basket.items.count(),
models.Find.objects.count(),
@@ -885,8 +899,17 @@ class TreatmentTest(FindInit, TestCase):
treatment = models.Treatment()
initial_find = self.finds[0]
- treatment.save(user=self.get_default_user(), items=self.basket,
- treatment_type_list=[treatment_type])
+ completed, created = models.TreatmentState.objects.get_or_create(
+ txt_idx='completed', defaults={"executed": True, "label": u"Done"}
+ )
+ completed.executed = True
+ completed.save()
+
+ treatment.treatment_state = completed
+ treatment.save(
+ user=self.get_default_user(), items=self.basket,
+ treatment_type_list=[treatment_type],
+ )
treatment.treatment_types.add(treatment_type)
self.assertEqual(nb_find, models.Find.objects.count())
@@ -912,8 +935,17 @@ class TreatmentTest(FindInit, TestCase):
treatment = models.Treatment()
initial_find = self.finds[0]
- treatment.save(user=self.get_default_user(), items=self.basket,
- treatment_type_list=[treatment_type])
+ completed, created = models.TreatmentState.objects.get_or_create(
+ txt_idx='completed', defaults={"executed": True, "label": u"Done"}
+ )
+ completed.executed = True
+ completed.save()
+
+ treatment.treatment_state = completed
+ treatment.save(
+ user=self.get_default_user(), items=self.basket,
+ treatment_type_list=[treatment_type],
+ )
treatment.treatment_types.add(treatment_type)
nb_b = self.basket.items.count()
@@ -944,8 +976,17 @@ class TreatmentTest(FindInit, TestCase):
treatment = models.Treatment()
initial_find = self.finds[0]
- treatment.save(user=self.get_default_user(), items=self.basket,
- treatment_type_list=[treatment_type])
+ completed, created = models.TreatmentState.objects.get_or_create(
+ txt_idx='completed', defaults={"executed": True, "label": u"Done"}
+ )
+ completed.executed = True
+ completed.save()
+
+ treatment.treatment_state = completed
+ treatment.save(
+ user=self.get_default_user(), items=self.basket,
+ treatment_type_list=[treatment_type],
+ )
treatment.treatment_types.add(treatment_type)
nb_b = self.basket.items.count()