Commit 5e176a44a2240985fa4b111060e461c770721eb0

Authored by AlexDiatlov
1 parent b7c38414

put plan tender in all tender procedures

@@ -352,8 +352,8 @@ def test_tender_data_planning(params): @@ -352,8 +352,8 @@ def test_tender_data_planning(params):
352 return munchify(data) 352 return munchify(data)
353 353
354 354
355 -def test_tender_data_limited(params):  
356 - data = test_tender_data(params) 355 +def test_tender_data_limited(params, plan_data):
  356 + data = test_tender_data(params, plan_data)
357 del data["submissionMethodDetails"] 357 del data["submissionMethodDetails"]
358 del data["minimalStep"] 358 del data["minimalStep"]
359 del data["enquiryPeriod"] 359 del data["enquiryPeriod"]
@@ -657,21 +657,21 @@ def test_change_document_data(document, change_id): @@ -657,21 +657,21 @@ def test_change_document_data(document, change_id):
657 return munchify(document) 657 return munchify(document)
658 658
659 659
660 -def test_tender_data_openua(params, submissionMethodDetails): 660 +def test_tender_data_openua(params, submissionMethodDetails, plan_data):
661 # We should not provide any values for `enquiryPeriod` when creating 661 # We should not provide any values for `enquiryPeriod` when creating
662 # an openUA or openEU procedure. That field should not be present at all. 662 # an openUA or openEU procedure. That field should not be present at all.
663 # Therefore, we pass a nondefault list of periods to `test_tender_data()`. 663 # Therefore, we pass a nondefault list of periods to `test_tender_data()`.
664 - data = test_tender_data(params, ('tender',), submissionMethodDetails) 664 + data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails)
665 data['procurementMethodType'] = 'aboveThresholdUA' 665 data['procurementMethodType'] = 'aboveThresholdUA'
666 data['procuringEntity']['kind'] = 'general' 666 data['procuringEntity']['kind'] = 'general'
667 return data 667 return data
668 668
669 669
670 -def test_tender_data_openua_defense(params, submissionMethodDetails): 670 +def test_tender_data_openua_defense(params, submissionMethodDetails, plan_data):
671 """We should not provide any values for `enquiryPeriod` when creating 671 """We should not provide any values for `enquiryPeriod` when creating
672 an openUA, openEU or openUA_defense procedure. That field should not be present at all. 672 an openUA, openEU or openUA_defense procedure. That field should not be present at all.
673 Therefore, we pass a nondefault list of periods to `test_tender_data()`.""" 673 Therefore, we pass a nondefault list of periods to `test_tender_data()`."""
674 - data = test_tender_data(params, ('tender',), submissionMethodDetails) 674 + data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails)
675 data['procurementMethodType'] = 'aboveThresholdUA.defense' 675 data['procurementMethodType'] = 'aboveThresholdUA.defense'
676 data['procuringEntity']['kind'] = 'defense' 676 data['procuringEntity']['kind'] = 'defense'
677 return data 677 return data
@@ -694,8 +694,8 @@ def test_tender_data_openeu(params, submissionMethodDetails, plan_data): @@ -694,8 +694,8 @@ def test_tender_data_openeu(params, submissionMethodDetails, plan_data):
694 return data 694 return data
695 695
696 696
697 -def test_tender_data_framework_agreement(params, submissionMethodDetails):  
698 - data = test_tender_data_openeu(params, submissionMethodDetails) 697 +def test_tender_data_framework_agreement(params, submissionMethodDetails, plan_data):
  698 + data = test_tender_data_openeu(params, submissionMethodDetails, plan_data)
699 data['procurementMethodType'] = 'closeFrameworkAgreementUA' 699 data['procurementMethodType'] = 'closeFrameworkAgreementUA'
700 data['maxAwardsCount'] = fake.random_int(min=3, max=5) 700 data['maxAwardsCount'] = fake.random_int(min=3, max=5)
701 data['agreementDuration'] = create_fake_IsoDurationType( 701 data['agreementDuration'] = create_fake_IsoDurationType(
@@ -709,11 +709,11 @@ def test_tender_data_framework_agreement(params, submissionMethodDetails): @@ -709,11 +709,11 @@ def test_tender_data_framework_agreement(params, submissionMethodDetails):
709 return data 709 return data
710 710
711 711
712 -def test_tender_data_competitive_dialogue(params, submissionMethodDetails): 712 +def test_tender_data_competitive_dialogue(params, submissionMethodDetails, plan_data):
713 # We should not provide any values for `enquiryPeriod` when creating 713 # We should not provide any values for `enquiryPeriod` when creating
714 # an openUA or openEU procedure. That field should not be present at all. 714 # an openUA or openEU procedure. That field should not be present at all.
715 # Therefore, we pass a nondefault list of periods to `test_tender_data()`. 715 # Therefore, we pass a nondefault list of periods to `test_tender_data()`.
716 - data = test_tender_data(params, ('tender',), submissionMethodDetails) 716 + data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails)
717 if params.get('dialogue_type') == 'UA': 717 if params.get('dialogue_type') == 'UA':
718 data['procurementMethodType'] = 'competitiveDialogueUA' 718 data['procurementMethodType'] = 'competitiveDialogueUA'
719 else: 719 else:
@@ -861,8 +861,8 @@ def test_elimination_report(corruption, relatedParty_id): @@ -861,8 +861,8 @@ def test_elimination_report(corruption, relatedParty_id):
861 }) 861 })
862 862
863 863
864 -def test_tender_data_esco(params, submissionMethodDetails):  
865 - data = test_tender_data(params, ('tender',), submissionMethodDetails) 864 +def test_tender_data_esco(params, submissionMethodDetails, plan_data):
  865 + data = test_tender_data(params, ('tender',), submissionMethodDetails, plan_data)
866 data['procurementMethodType'] = 'esco' 866 data['procurementMethodType'] = 'esco'
867 data['title_en'] = "[TESTING]" 867 data['title_en'] = "[TESTING]"
868 for item_number, item in enumerate(data['items']): 868 for item_number, item in enumerate(data['items']):
@@ -18,6 +18,7 @@ ${MOZ_INTEGRATION} ${False} @@ -18,6 +18,7 @@ ${MOZ_INTEGRATION} ${False}
18 ${VAT_INCLUDED} ${True} 18 ${VAT_INCLUDED} ${True}
19 ${ROAD_INDEX} ${False} 19 ${ROAD_INDEX} ${False}
20 ${GMDN_INDEX} ${False} 20 ${GMDN_INDEX} ${False}
  21 +${PLAN_TENDER} ${True}
21 22
22 *** Test Cases *** 23 *** Test Cases ***
23 ############################################################################################## 24 ##############################################################################################
@@ -18,6 +18,7 @@ ${MOZ_INTEGRATION} ${False} @@ -18,6 +18,7 @@ ${MOZ_INTEGRATION} ${False}
18 ${VAT_INCLUDED} ${True} 18 ${VAT_INCLUDED} ${True}
19 ${ROAD_INDEX} ${False} 19 ${ROAD_INDEX} ${False}
20 ${GMDN_INDEX} ${False} 20 ${GMDN_INDEX} ${False}
  21 +${PLAN_TENDER} ${True}
21 22
22 *** Test Cases *** 23 *** Test Cases ***
23 ############################################################################################## 24 ##############################################################################################
@@ -18,6 +18,7 @@ ${MOZ_INTEGRATION} ${False} @@ -18,6 +18,7 @@ ${MOZ_INTEGRATION} ${False}
18 ${VAT_INCLUDED} ${True} 18 ${VAT_INCLUDED} ${True}
19 ${ROAD_INDEX} ${False} 19 ${ROAD_INDEX} ${False}
20 ${GMDN_INDEX} ${False} 20 ${GMDN_INDEX} ${False}
  21 +${PLAN_TENDER} ${True}
21 22
22 *** Test Cases *** 23 *** Test Cases ***
23 ############################################################################################## 24 ##############################################################################################
Please register or login to post a comment