diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-16 11:37:49 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-16 11:37:49 +0200 |
| commit | a3b43ca1c735ee9ee5b6eafedc445343b81d2829 (patch) | |
| tree | 71698bf990c62a59dee536184fd57c8fae0a6226 /archaeological_finds | |
| parent | ebd0bd88a06fd3383307f6e325d203db15c54979 (diff) | |
| parent | 21471477868c597b7223f265553340ddd3ceb4f7 (diff) | |
| download | Ishtar-a3b43ca1c735ee9ee5b6eafedc445343b81d2829.tar.bz2 Ishtar-a3b43ca1c735ee9ee5b6eafedc445343b81d2829.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/tests.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index 27336a05d..51bb516ea 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -94,7 +94,7 @@ class FindInit(ContextRecordInit): self.base_find = [] -class AFindWizardCreationTest(WizardTest, FindInit, TestCase): +class FindWizardCreationTest(WizardTest, FindInit, TestCase): # TODO: first to be run because of strange init things... fixtures = [settings.ROOT_PATH + '../fixtures/initial_data.json', @@ -137,12 +137,13 @@ class AFindWizardCreationTest(WizardTest, FindInit, TestCase): cr = self.create_context_record( data={'parcel': self.create_parcel()[-1]}, force=True)[-1] - self.form_datas[0].form_datas['selecrecord-find_creation']['pk'] = cr.pk + self.form_datas[0].form_datas['selecrecord-find_creation']['pk'] = \ + cr.pk self.form_datas[0].form_datas['dating-find_creation'][0]['period'] = \ Period.objects.all()[0].pk self.find_number = models.Find.objects.count() self.basefind_number = models.BaseFind.objects.count() - super(AFindWizardCreationTest, self).pre_wizard() + super(FindWizardCreationTest, self).pre_wizard() def post_wizard(self): self.assertEqual(models.BaseFind.objects.count(), @@ -153,8 +154,7 @@ class AFindWizardCreationTest(WizardTest, FindInit, TestCase): self.assertEqual(find.datings.count(), 1) -class ATreatmentWizardCreationTest(WizardTest, FindInit, TestCase): - # TODO: first to be run because of strange init things... +class TreatmentWizardCreationTest(WizardTest, FindInit, TestCase): fixtures = [settings.ROOT_PATH + '../fixtures/initial_data.json', settings.ROOT_PATH + @@ -211,7 +211,7 @@ class ATreatmentWizardCreationTest(WizardTest, FindInit, TestCase): self.form_datas[0].form_datas['selecfind-treatment_creation'][ 'resulting_pk'] = self.find.pk self.treatment_number = models.Treatment.objects.count() - super(ATreatmentWizardCreationTest, self).pre_wizard() + super(TreatmentWizardCreationTest, self).pre_wizard() def post_wizard(self): self.assertEqual(models.Treatment.objects.count(), |