diff options
Diffstat (limited to 'archaeological_finds/tests.py')
| -rw-r--r-- | archaeological_finds/tests.py | 21 | 
1 files changed, 7 insertions, 14 deletions
| diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index 7a2485fc1..569f81669 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -119,13 +119,8 @@ class AFindWizardCreationTest(WizardTest, FindInit, TestCase):      ]      def pre_wizard(self): -        q = ContextRecord.objects.filter(pk=1) -        if not q.count(): -            cr = self.create_context_record()[0] -            cr.operation = self.create_operation()[0] -            self.form_datas[0].form_datas['selecrecord-find_creation'][ -                'pk'] = cr.pk -            cr.save() +        cr = self.create_context_record()[-1] +        self.form_datas[0].form_datas['selecrecord-find_creation']['pk'] = cr.pk          self.find_number = models.Find.objects.count()          self.basefind_number = models.BaseFind.objects.count()          super(AFindWizardCreationTest, self).pre_wizard() @@ -189,19 +184,17 @@ class ATreatmentWizardCreationTest(WizardTest, FindInit, TestCase):              person = Person.objects.create(name="default")              person.id = 1              person.save() -        if not models.Find.objects.filter(pk=1).count(): -            find = self.get_default_find(force=True) -            self.form_datas[0].form_datas['selecfind-treatment_creation'][ -                'pk'] = find.pk -            self.form_datas[0].form_datas['selecfind-treatment_creation'][ -                'resulting_pk'] = find.pk +        find = self.get_default_find(force=True) +        self.form_datas[0].form_datas['selecfind-treatment_creation'][ +            'pk'] = find.pk +        self.form_datas[0].form_datas['selecfind-treatment_creation'][ +            'resulting_pk'] = find.pk          self.treatment_number = models.Treatment.objects.count()          super(ATreatmentWizardCreationTest, self).pre_wizard()      def post_wizard(self):          self.assertEqual(models.Treatment.objects.count(),                           self.treatment_number + 1) -        pass  class ImportFindTest(ImportContextRecordTest): | 
