Alex / prozorro-robot_tests · Commits

Commit 754f7434b2e68cd5c95215a98a72aa9242629df9

Authored by jenkins@playtender.xyz
2 parents e14afd8f dc6087eb
build: skipped

Merge branch 'master' into master_new

Inline Side-by-side
Showing 5 changed files with 150 additions and 13 deletions
@@ -53,6 +53,9 @@ Default: @@ -53,6 +53,9 @@ Default:
53 tender: [0, 30] 53 tender: [0, 30]
54 framework_selection: 54 framework_selection:
55 accelerator: 360 55 accelerator: 360
  56 + open_simple_defense:
  57 + accelerator: 1440
  58 + tender: [0, 10]
56 # Synchronization delay, in seconds 59 # Synchronization delay, in seconds
57 timeout_on_wait: 300 60 timeout_on_wait: 300
58 Quinta: 61 Quinta:
@@ -83,6 +86,9 @@ Quinta: @@ -83,6 +86,9 @@ Quinta:
83 priceQuotation: 86 priceQuotation:
84 tender: [0, 15] 87 tender: [0, 15]
85 accelerator: 1440 88 accelerator: 1440
  89 + open_simple_defense:
  90 + accelerator: 1440
  91 + tender: [0, 10]
86 keywords_file: openprocurement_client 92 keywords_file: openprocurement_client
87 roles: 93 roles:
88 provider: Tender_User 94 provider: Tender_User
@@ -24,7 +24,7 @@ fake = fake_uk @@ -24,7 +24,7 @@ fake = fake_uk
24 used_identifier_id = [] 24 used_identifier_id = []
25 mode_open = ["belowThreshold", "aboveThresholdUA", "aboveThresholdEU", 25 mode_open = ["belowThreshold", "aboveThresholdUA", "aboveThresholdEU",
26 "aboveThresholdUA.defense", "competitiveDialogueUA", "competitiveDialogueEU", "esco", 26 "aboveThresholdUA.defense", "competitiveDialogueUA", "competitiveDialogueEU", "esco",
27 - "closeFrameworkAgreementUA"] 27 + "closeFrameworkAgreementUA", "simple.defense"]
28 mode_limited = ["reporting", "negotiation.quick", "negotiation"] 28 mode_limited = ["reporting", "negotiation.quick", "negotiation"]
29 mode_selective = ["priceQuotation"] 29 mode_selective = ["priceQuotation"]
30 violationType = ["corruptionDescription", "corruptionProcurementMethodType", "corruptionChanges", 30 violationType = ["corruptionDescription", "corruptionProcurementMethodType", "corruptionChanges",
@@ -332,7 +332,7 @@ def test_tender_data_planning(params): @@ -332,7 +332,7 @@ def test_tender_data_planning(params):
332 "buyers": [] 332 "buyers": []
333 } 333 }
334 data["procuringEntity"]["name"] = data["procuringEntity"]["identifier"]["legalName"] 334 data["procuringEntity"]["name"] = data["procuringEntity"]["identifier"]["legalName"]
335 - if params.get("mode") == "aboveThresholdUA.defense": 335 + if params.get("mode") in ["aboveThresholdUA.defense", "simple.defense"]:
336 data["procuringEntity"]["kind"] = "defense" 336 data["procuringEntity"]["kind"] = "defense"
337 elif params.get("mode") in ["belowThreshold", "reporting"]: 337 elif params.get("mode") in ["belowThreshold", "reporting"]:
338 data["procuringEntity"]["kind"] = "other" 338 data["procuringEntity"]["kind"] = "other"
@@ -849,9 +849,9 @@ def test_change_document_data(document, change_id): @@ -849,9 +849,9 @@ def test_change_document_data(document, change_id):
849 849
850 850
851 def test_tender_data_openua(params, submissionMethodDetails, plan_data): 851 def test_tender_data_openua(params, submissionMethodDetails, plan_data):
852 - # We should not provide any values for `enquiryPeriod` when creating  
853 - # an openUA or openEU procedure. That field should not be present at all.  
854 - # Therefore, we pass a nondefault list of periods to `test_tender_data()`. 852 + """We should not provide any values for `enquiryPeriod` when creating
  853 + an openUA, openEU, openUA_defense or open_simple_defense procedure. That field should not be present at all.
  854 + Therefore, we pass a nondefault list of periods to `test_tender_data()`."""
855 data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails) 855 data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails)
856 data['procurementMethodType'] = 'aboveThresholdUA' 856 data['procurementMethodType'] = 'aboveThresholdUA'
857 data['procuringEntity']['kind'] = 'general' 857 data['procuringEntity']['kind'] = 'general'
@@ -869,9 +869,9 @@ def test_tender_data_openua_defense(params, submissionMethodDetails, plan_data): @@ -869,9 +869,9 @@ def test_tender_data_openua_defense(params, submissionMethodDetails, plan_data):
869 869
870 870
871 def test_tender_data_openeu(params, submissionMethodDetails, plan_data): 871 def test_tender_data_openeu(params, submissionMethodDetails, plan_data):
872 - # We should not provide any values for `enquiryPeriod` when creating  
873 - # an openUA or openEU procedure. That field should not be present at all.  
874 - # Therefore, we pass a nondefault list of periods to `test_tender_data()`. 872 + """We should not provide any values for `enquiryPeriod` when creating
  873 + an openUA, openEU, openUA_defense or open_simple_defense procedure. That field should not be present at all.
  874 + Therefore, we pass a nondefault list of periods to `test_tender_data()`."""
875 data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails) 875 data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails)
876 data['procurementMethodType'] = 'aboveThresholdEU' 876 data['procurementMethodType'] = 'aboveThresholdEU'
877 data['title_en'] = "[TESTING]" 877 data['title_en'] = "[TESTING]"
@@ -899,9 +899,9 @@ def test_tender_data_framework_agreement(params, submissionMethodDetails, plan_d @@ -899,9 +899,9 @@ def test_tender_data_framework_agreement(params, submissionMethodDetails, plan_d
899 899
900 900
901 def test_tender_data_competitive_dialogue(params, submissionMethodDetails, plan_data): 901 def test_tender_data_competitive_dialogue(params, submissionMethodDetails, plan_data):
902 - # We should not provide any values for `enquiryPeriod` when creating  
903 - # an openUA or openEU procedure. That field should not be present at all.  
904 - # Therefore, we pass a nondefault list of periods to `test_tender_data()`. 902 + """We should not provide any values for `enquiryPeriod` when creating
  903 + an openUA, openEU, openUA_defense or open_simple_defense procedure. That field should not be present at all.
  904 + Therefore, we pass a nondefault list of periods to `test_tender_data()`."""
905 data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails) 905 data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails)
906 if params.get('dialogue_type') == 'UA': 906 if params.get('dialogue_type') == 'UA':
907 data['procurementMethodType'] = 'competitiveDialogueUA' 907 data['procurementMethodType'] = 'competitiveDialogueUA'
@@ -934,6 +934,16 @@ def test_tender_data_selection(procedure_intervals, params, submissionMethodDeta @@ -934,6 +934,16 @@ def test_tender_data_selection(procedure_intervals, params, submissionMethodDeta
934 return munchify({'data': data}) 934 return munchify({'data': data})
935 935
936 936
  937 +def test_tender_data_simple_defense(params, submissionMethodDetails, plan_data):
  938 + """We should not provide any values for `enquiryPeriod` when creating
  939 + an openUA, openEU, openUA_defense or open_simple_defense procedure. That field should not be present at all.
  940 + Therefore, we pass a nondefault list of periods to `test_tender_data()`."""
  941 + data = test_tender_data(params, plan_data, ('tender',), submissionMethodDetails)
  942 + data['procurementMethodType'] = 'simple.defense'
  943 + data['procuringEntity']['kind'] = 'defense'
  944 + return data
  945 +
  946 +
937 def test_change_data(): 947 def test_change_data():
938 return munchify( 948 return munchify(
939 { 949 {
@@ -94,7 +94,8 @@ from .initial_data import ( @@ -94,7 +94,8 @@ from .initial_data import (
94 test_data_bid_criteria, 94 test_data_bid_criteria,
95 test_bid_criteria, 95 test_bid_criteria,
96 test_qualification_criteria, 96 test_qualification_criteria,
97 - test_awards_criteria 97 + test_awards_criteria,
  98 + test_tender_data_simple_defense
98 ) 99 )
99 from barbecue import chef 100 from barbecue import chef
100 from restkit import request 101 from restkit import request
@@ -388,6 +389,9 @@ def prepare_test_tender_data(procedure_intervals, @@ -388,6 +389,9 @@ def prepare_test_tender_data(procedure_intervals,
388 tender_parameters, submissionMethodDetails, plan_data)}) 389 tender_parameters, submissionMethodDetails, plan_data)})
389 elif mode == 'priceQuotation': 390 elif mode == 'priceQuotation':
390 return munchify({'data': test_tender_data_pq(tender_parameters, submissionMethodDetails, plan_data)}) 391 return munchify({'data': test_tender_data_pq(tender_parameters, submissionMethodDetails, plan_data)})
  392 + elif mode == "open_simple_defense":
  393 + return munchify({'data': test_tender_data_simple_defense(
  394 + tender_parameters, submissionMethodDetails, plan_data)})
391 395
392 # The previous line needs an explicit keyword argument because, 396 # The previous line needs an explicit keyword argument because,
393 # unlike previous functions, this one has three arguments. 397 # unlike previous functions, this one has three arguments.
@@ -644,7 +648,8 @@ def generate_test_bid_data(tender_data, edrpou=None): @@ -644,7 +648,8 @@ def generate_test_bid_data(tender_data, edrpou=None):
644 bid = test_bid_competitive_data() 648 bid = test_bid_competitive_data()
645 bid.data.selfQualified = True 649 bid.data.selfQualified = True
646 elif tender_data.get('procurementMethodType', '') in ( 650 elif tender_data.get('procurementMethodType', '') in (
647 - 'aboveThresholdUA.defense'): 651 + 'aboveThresholdUA.defense',
  652 + 'simple.defense'):
648 bid = test_bid_competitive_data() 653 bid = test_bid_competitive_data()
649 bid.data.selfEligible = True 654 bid.data.selfEligible = True
650 bid.data.selfQualified = True 655 bid.data.selfQualified = True
  1 +-v MODE:open_simple_defense
  2 +
  3 +-v NUMBER_OF_ITEMS:1
  4 +-v NUMBER_OF_LOTS:1
  5 +
  6 +-v TENDER_MEAT:True
  7 +-v ITEM_MEAT:False
  8 +-v LOT_MEAT:False
  9 +
  10 +-i create_tender
  11 +-i find_tender
  12 +-i tender_view
  13 +-i tender_view_milestone
  14 +-i tender_view_value
  15 +-i tender_view_minimalStep
  16 +-i tender_view_deliveryDate
  17 +-i tender_view_quantity
  18 +-i tender_view_unit_name
  19 +-i meat_view
  20 +-i lot_view
  21 +-i lot_view_value
  22 +-i lot_view_minimalStep
  23 +-i open_tender_view
  24 +
  25 +-i extend_tendering_period
  26 +-i add_tender_doc
  27 +-i modify_lot_value_amount
  28 +
  29 +-i add_tender_meat
  30 + -i delete_tender_meat
  31 +
  32 +-i ask_question_to_tender
  33 +-i answer_question_after_clarifications_period
  34 +
  35 +-i modify_tender_after_questions
  36 +
  37 +-i make_bid_by_provider
  38 + -i modify_bid_by_provider
  39 + -i add_doc_to_bid_by_provider
  40 +-i make_bid_by_provider1
  41 +
  42 +-i open_confirm_first_bid
  43 +-i open_confirm_second_bid
  44 +
  45 +-i ask_question_to_tender_after_tendering_period
  46 +
  47 +-i auction
  48 +
  49 +-i qualification_add_doc_to_first_award
  50 +-i qualification_approve_first_award
  51 +
  52 +-i contract_stand_still
  53 +-i contract_view
  54 +-i contract_view_dateSigned
  55 +-i modify_contract_amount_net
  56 +-i modify_contract_value
  57 +-i modify_contract
  58 +-i add_doc_to_contract
  59 +-i contract_doc_documentOf
  60 +-i contract_sign
  1 +-v MODE:open_simple_defense
  2 +
  3 +-v NUMBER_OF_ITEMS:1
  4 +-v NUMBER_OF_LOTS:1
  5 +
  6 +-v TENDER_MEAT:True
  7 +-v ITEM_MEAT:False
  8 +-v LOT_MEAT:False
  9 +
  10 +-i create_tender
  11 +-i find_tender
  12 +-i tender_view
  13 +-i tender_view_milestone
  14 +-i tender_view_value
  15 +-i tender_view_minimalStep
  16 +-i tender_view_deliveryDate
  17 +-i tender_view_quantity
  18 +-i tender_view_unit_name
  19 +-i meat_view
  20 +-i lot_view
  21 +-i lot_view_value
  22 +-i lot_view_minimalStep
  23 +-i open_tender_view
  24 +
  25 +-i extend_tendering_period
  26 +-i add_tender_doc
  27 +-i modify_lot_value_amount
  28 +
  29 +-i add_tender_meat
  30 + -i delete_tender_meat
  31 +
  32 +-i ask_question_to_tender
  33 +-i answer_question_after_clarifications_period
  34 +
  35 +-i modify_tender_after_questions
  36 +
  37 +-i make_bid_by_provider
  38 + -i modify_bid_by_provider
  39 + -i add_doc_to_bid_by_provider
  40 +
  41 + -i open_confirm_first_bid
  42 +
  43 +-i ask_question_to_tender_after_tendering_period
  44 +
  45 +-i qualification_add_doc_to_first_award
  46 +-i qualification_approve_first_award
  47 +
  48 +-i contract_stand_still
  49 +-i contract_view
  50 +-i contract_view_dateSigned
  51 +-i modify_contract_amount_net
  52 +-i modify_contract_value
  53 +-i modify_contract
  54 +-i add_doc_to_contract
  55 +-i contract_doc_documentOf
  56 +-i contract_sign
Please register or login to post a comment