diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-05-29 11:19:14 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-05-29 11:19:14 +0200 |
commit | d3bf3f911488ddd5a9fd5617fb28e0f26a7f4e1a (patch) | |
tree | 87d0f32604e7b960870a72713094dabfd3e3553e /archaeological_operations/tests.py | |
parent | 1384bedf3b57a7a78f2412958d54fb93779b80eb (diff) | |
download | Ishtar-d3bf3f911488ddd5a9fd5617fb28e0f26a7f4e1a.tar.bz2 Ishtar-d3bf3f911488ddd5a9fd5617fb28e0f26a7f4e1a.zip |
Fix operation_code display when old_code is hidden (refs #4104)
Diffstat (limited to 'archaeological_operations/tests.py')
-rw-r--r-- | archaeological_operations/tests.py | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index 657a3aa4c..e95010d36 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -1809,6 +1809,20 @@ class OperationWizardModifTest(WizardTest, OperationInitTest, TestCase): }, ignored=base_ignored_steps ), + FormData( + "Set an operation to an exiting operation code for this year", + form_datas={ + 'selec': {}, + 'general': { + 'operation_type': 2, + 'operation_code': 42, + 'year': 2017}, + 'townsgeneral': [], + 'parcelsgeneral': [], + }, + ignored=base_ignored_steps, + error_expected='general' + ), ] def pre_wizard(self): @@ -1819,6 +1833,12 @@ class OperationWizardModifTest(WizardTest, OperationInitTest, TestCase): init_parcel = self.create_parcel()[0] operation.parcels.add(init_parcel) + self.create_operation() + operation2 = self.operations[1] + operation2.year = 2017 + operation2.operation_code = 42 + operation2.save() + from archaeological_context_records.models import ContextRecord cr_data = {'label': "Context record", "operation": operation, 'parcel': init_parcel, @@ -1831,14 +1851,17 @@ class OperationWizardModifTest(WizardTest, OperationInitTest, TestCase): self.form_datas[0].set('general', 'operation_type', self.ope_type.pk) self.form_datas[1].set('general', 'operation_type', self.ope_type.pk) self.form_datas[2].set('general', 'operation_type', self.ope_type.pk) + self.form_datas[3].set('general', 'operation_type', self.ope_type.pk) data = self.form_datas[0].form_datas data2 = self.form_datas[1].form_datas data3 = self.form_datas[2].form_datas + data4 = self.form_datas[3].form_datas data['selec']['pk'] = operation.pk data2['selec']['pk'] = operation.pk data3['selec']['pk'] = operation.pk + data4['selec']['pk'] = operation.pk town = self.create_towns( datas={'numero_insee': '67890', 'name': 'Twin Peaks'})[-1] @@ -1846,6 +1869,7 @@ class OperationWizardModifTest(WizardTest, OperationInitTest, TestCase): data['townsgeneral'] = towns data2['townsgeneral'] = towns data3['townsgeneral'] = towns + data4['townsgeneral'] = towns parcel_data = { 'town': town.pk, 'year': 2017, 'section': 'S', @@ -1853,6 +1877,7 @@ class OperationWizardModifTest(WizardTest, OperationInitTest, TestCase): data['parcelsgeneral'].append(parcel_data) data2['parcelsgeneral'].append(parcel_data) data3['parcelsgeneral'].append(parcel_data) + data4['parcelsgeneral'].append(parcel_data) parcel_data_2 = { 'town': init_parcel.town.pk, 'year': init_parcel.year or '', |