diff options
Diffstat (limited to 'archaeological_finds/tests.py')
| -rw-r--r-- | archaeological_finds/tests.py | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index 6b5c1f1b1..2cf184561 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -573,20 +573,24 @@ class TreatmentWizardCreationTest(WizardTest, FindInit, TestCase): loan.save() self.form_datas[2].set("basetreatment", "treatment_type", loan.pk) - planned, __ = models.TreatmentState.objects.get_or_create( - txt_idx="planned", defaults={"executed": False, "label": "Planned"} + planned, __ = models.TreatmentInputStatus.objects.get_or_create( + txt_idx="draft", defaults={"executed": False, "label": "Draft"} ) planned.executed = False planned.save() - self.form_datas[0].set("basetreatment", "treatment_state", planned.pk) + self.form_datas[0].set("basetreatment", "input_status", planned.pk) - completed, created = models.TreatmentState.objects.get_or_create( - txt_idx="completed", defaults={"executed": True, "label": "Done"} + completed, created = models.TreatmentInputStatus.objects.get_or_create( + txt_idx="validated", defaults={"executed": True, "label": "Validated"} ) completed.executed = True completed.save() - self.form_datas[1].set("basetreatment", "treatment_state", completed.pk) - self.form_datas[2].set("basetreatment", "treatment_state", completed.pk) + self.form_datas[1].set("basetreatment", "input_status", completed.pk) + self.form_datas[2].set("basetreatment", "input_status", completed.pk) + + status = models.TreatmentStatus.objects.all()[0] + for form_data in self.form_datas: + form_data.set("basetreatment", "treatment_status", status.pk) self.treatment_number = models.Treatment.objects.count() @@ -2220,10 +2224,10 @@ class FindQATest(FindInit, TestCase): def test_duplicate(self): t1, __ = models.Treatment.objects.get_or_create( - label="Treatment 1", treatment_state=models.TreatmentState.objects.all()[0] + label="Treatment 1", input_status=models.TreatmentInputStatus.objects.all()[0] ) t2, __ = models.Treatment.objects.get_or_create( - label="Treatment 1", treatment_state=models.TreatmentState.objects.all()[0] + label="Treatment 2", input_status=models.TreatmentInputStatus.objects.all()[0] ) find = self.finds[0] default_desc = "Description for duplicate" @@ -2778,13 +2782,13 @@ class TreatmentTest(FindInit, TestCase): first_find = self.finds[0] - completed, created = models.TreatmentState.objects.get_or_create( - txt_idx="completed", defaults={"executed": True, "label": "Done"} + completed, created = models.TreatmentInputStatus.objects.get_or_create( + txt_idx="validated", defaults={"executed": True, "label": "Validated"} ) completed.executed = True completed.save() - treatment.treatment_state = completed + treatment.input_status = completed treatment.save( user=self.get_default_user(), items=self.basket, @@ -2833,13 +2837,13 @@ class TreatmentTest(FindInit, TestCase): treatment = models.Treatment() initial_find = self.finds[0] - completed, created = models.TreatmentState.objects.get_or_create( - txt_idx="completed", defaults={"executed": True, "label": "Done"} + completed, created = models.TreatmentInputStatus.objects.get_or_create( + txt_idx="validated", defaults={"executed": True, "label": "Validated"} ) completed.executed = True completed.save() - treatment.treatment_state = completed + treatment.input_status = completed treatment.save( user=self.get_default_user(), items=self.basket, @@ -2869,13 +2873,13 @@ class TreatmentTest(FindInit, TestCase): treatment = models.Treatment() initial_find = self.finds[0] - completed, created = models.TreatmentState.objects.get_or_create( - txt_idx="completed", defaults={"executed": True, "label": "Done"} + completed, created = models.TreatmentInputStatus.objects.get_or_create( + txt_idx="validated", defaults={"executed": True, "label": "Validated"} ) completed.executed = True completed.save() - treatment.treatment_state = completed + treatment.input_status = completed treatment.save( user=self.get_default_user(), items=self.basket, @@ -2909,13 +2913,13 @@ class TreatmentTest(FindInit, TestCase): treatment = models.Treatment() initial_find = self.finds[0] - completed, created = models.TreatmentState.objects.get_or_create( - txt_idx="completed", defaults={"executed": True, "label": "Done"} + completed, created = models.TreatmentInputStatus.objects.get_or_create( + txt_idx="validated", defaults={"executed": True, "label": "Validated"} ) completed.executed = True completed.save() - treatment.treatment_state = completed + treatment.input_status = completed treatment.save( user=self.get_default_user(), items=self.basket, @@ -2973,7 +2977,7 @@ class AutocompleteTest(AutocompleteTestBase, TestCase): def create_treatment(self, base_name): item, __ = models.Treatment.objects.get_or_create( - label=base_name, treatment_state=models.TreatmentState.objects.all()[0] + label=base_name, input_status=models.TreatmentInputStatus.objects.all()[0] ) return item, None |