diff options
| -rw-r--r-- | archaeological_finds/tests.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index fdced4bd4..e7afcbf66 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -203,12 +203,13 @@ class PackagingTest(FindInit, TestCase): def testPackaging(self): treatment_type = models.TreatmentType.objects.get(txt_idx='packaging') - treatment = models.Treatment(treatment_type=treatment_type) + treatment = models.Treatment() items_nb = models.Find.objects.count() treatment.save(user=self.get_default_user(), items=self.basket) self.assertEqual(items_nb + self.basket.items.count(), models.Find.objects.count(), msg="Packaging doesn't generate enough new finds") + treatment.treatment_types.add(treatment_type) # new version of the find is in the basket for item in self.basket.items.all(): self.assertNotIn( @@ -245,12 +246,16 @@ class TreatmentWizardCreationTest(WizardTest, FindInit, TestCase): 'treatment_type': 4, # move 'person': 1, # doer 'location': 1, # associated warehouse + 'year': 2016, + 'target_is_basket': False }, 'selecfind-treatment_creation': { - 'pk': 1 + 'pk': 1, + 'resulting_pk': 1 } }, ignored=('resultfind-treatment_creation', + 'selecbasket-treatment_creation', 'resultfinds-treatment_creation')) ] @@ -261,6 +266,7 @@ class TreatmentWizardCreationTest(WizardTest, FindInit, TestCase): name="default", warehouse_type=WarehouseType.objects.all()[0]) warehouse.id = 1 warehouse.save() + self.create_finds({"label": u"Find 1"}, force=True) self.treatment_number = models.Treatment.objects.count() super(TreatmentWizardCreationTest, self).pre_wizard() |