summaryrefslogtreecommitdiff
path: root/archaeological_operations/tests.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2020-01-23 11:19:49 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2020-07-01 18:01:59 +0200
commit3092612f54ecaba7ede5e5564f40ac36e873dd67 (patch)
treea0eb208693797006754d81f5f2f7167cab5d0e1c /archaeological_operations/tests.py
parentba421b42b5411331d77e41706fef543130b427bd (diff)
downloadIshtar-3092612f54ecaba7ede5e5564f40ac36e873dd67.tar.bz2
Ishtar-3092612f54ecaba7ede5e5564f40ac36e873dd67.zip
Fix test initialization for wizards
Diffstat (limited to 'archaeological_operations/tests.py')
-rw-r--r--archaeological_operations/tests.py28
1 files changed, 11 insertions, 17 deletions
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index af6988568..9cb715a6f 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -2622,19 +2622,16 @@ class OperationWizardCreationTest(WizardTest, OperationInitTest, TestCase):
if 'townsgeneral' not in \
self.form_datas[0].form_datas:
return super(OperationWizardCreationTest, self).pre_wizard()
+
town = self.create_towns()[0]
town_data = {'town': town.pk}
- self.form_datas[0].form_datas[
- 'townsgeneral'].append(town_data)
- self.form_datas[1].form_datas[
- 'townsgeneral'].append(town_data)
parcel_data = {
'town': town.pk, 'year': 2017, 'section': 'S',
'parcel_number': '42'}
- self.form_datas[0].form_datas[
- 'parcelsgeneral'].append(parcel_data)
- self.form_datas[1].form_datas[
- 'parcelsgeneral'].append(parcel_data)
+
+ for idx in range(0, 2):
+ self.form_datas[idx].append('townsgeneral', town_data)
+ self.form_datas[idx].append('parcelsgeneral', parcel_data)
FI = FileInit()
FI.create_file()
@@ -2645,6 +2642,7 @@ class OperationWizardCreationTest(WizardTest, OperationInitTest, TestCase):
)
file.parcels.add(parcel)
self.form_datas[2].set('filechoice', 'associated_file', file.pk)
+ self.form_datas[2].append('parcelsgeneral', {'parcel': parcel.pk})
self.form_datas[2].append('towns', town_data)
self.form_datas[2].append('parcels', {'parcel': parcel.pk})
@@ -2787,18 +2785,14 @@ class OperationWizardModifTest(WizardTest, OperationInitTest, TestCase):
town = self.create_towns(
datas={'numero_insee': '67890', 'name': 'Twin Peaks'})[-1]
towns = [{'town': town.pk}, {'town': init_town.pk}]
- data['townsgeneral'] = towns
- data2['townsgeneral'] = towns
- data3['townsgeneral'] = towns
- data4['townsgeneral'] = towns
-
parcel_data = {
'town': town.pk, 'year': 2017, 'section': 'S',
'parcel_number': '42'}
- data['parcelsgeneral'].append(parcel_data)
- data2['parcelsgeneral'].append(parcel_data)
- data3['parcelsgeneral'].append(parcel_data)
- data4['parcelsgeneral'].append(parcel_data)
+
+ for idx in range(0, 4):
+ for t in towns:
+ self.form_datas[idx].append('townsgeneral', t)
+ self.form_datas[idx].append('parcelsgeneral', parcel_data)
parcel_data_2 = {
'town': init_parcel.town.pk, 'year': init_parcel.year or '',