Commit a7f5526dade4963aab762b0e758d5d75f229ca00
Committed by
GitHub
Merge pull request #237 from gorserg/devel_competitive_dialogue2
Devel add competitive dialogue 2
Showing
6 changed files
with
119 additions
and
0 deletions
... | ... | @@ -16,6 +16,7 @@ Resource resource.robot |
16 | 16 | ... tender_meat=${${tender_meat}} |
17 | 17 | ... lot_meat=${${lot_meat}} |
18 | 18 | ... item_meat=${${item_meat}} |
19 | + Run keyword if '{dialogue_type}' != '${None}' Set to dictionary ${tender_parameters} dialogue_type=${dialogue_type} | |
19 | 20 | ${tender_data}= Підготувати дані для створення тендера ${tender_parameters} |
20 | 21 | ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_owner} ${tender_data} |
21 | 22 | ${TENDER_UAID}= Run As ${tender_owner} Створити тендер ${adapted_data} | ... | ... |
... | ... | @@ -38,6 +38,9 @@ Default: |
38 | 38 | openeu: |
39 | 39 | accelerator: 1440 |
40 | 40 | tender: [0, 30] |
41 | + open_competitive_dialogue: | |
42 | + accelerator: 1440 | |
43 | + tender: [0, 30] | |
41 | 44 | # Synchronization delay, in seconds |
42 | 45 | timeout_on_wait: 300 |
43 | 46 | Quinta: |
... | ... | @@ -49,6 +52,9 @@ Quinta: |
49 | 52 | tender: [1, 30] |
50 | 53 | openeu: |
51 | 54 | tender: [1, 30] |
55 | + open_competitive_dialogue: | |
56 | + accelerator: 1440 | |
57 | + tender: [0, 30] | |
52 | 58 | keywords_file: openprocurement_client |
53 | 59 | roles: |
54 | 60 | provider: Tender_User | ... | ... |
... | ... | @@ -375,3 +375,20 @@ def test_tender_data_openeu(params): |
375 | 375 | data['procuringEntity']['identifier']['legalName_en'] = "Institution \"Vinnytsia City Council primary and secondary general school № 10\"" |
376 | 376 | data['procuringEntity']['kind'] = 'general' |
377 | 377 | return data |
378 | + | |
379 | + | |
380 | +def test_tender_data_competitive_dialogue(params): | |
381 | + # We should not provide any values for `enquiryPeriod` when creating | |
382 | + # an openUA or openEU procedure. That field should not be present at all. | |
383 | + # Therefore, we pass a nondefault list of periods to `test_tender_data()`. | |
384 | + data = test_tender_data(params, ('tender',)) | |
385 | + data['procurementMethodType'] = 'competitiveDialogue.aboveThreshold' + params.get('dialogue_type', 'EU') | |
386 | + data['title_en'] = "[TESTING] {}".format(fake_en.sentence(nb_words=3, variable_nb_words=True)) | |
387 | + for item in data['items']: | |
388 | + item['description_en'] = fake_en.sentence(nb_words=3, variable_nb_words=True) | |
389 | + data['procuringEntity']['name_en'] = fake_en.name() | |
390 | + data['procuringEntity']['contactPoint']['name_en'] = fake_en.name() | |
391 | + data['procuringEntity']['contactPoint']['availableLanguage'] = "en" | |
392 | + data['procuringEntity']['identifier']['legalName_en'] = fake_en.sentence(nb_words=10, variable_nb_words=True) | |
393 | + data['procuringEntity']['kind'] = 'general' | |
394 | + return data | ... | ... |
... | ... | @@ -37,6 +37,7 @@ from .initial_data import ( |
37 | 37 | test_question_data, |
38 | 38 | test_supplier_data, |
39 | 39 | test_tender_data, |
40 | + test_tender_data_competitive_dialogue, | |
40 | 41 | test_tender_data_limited, |
41 | 42 | test_tender_data_openeu, |
42 | 43 | test_tender_data_openua, |
... | ... | @@ -285,6 +286,8 @@ def prepare_test_tender_data(procedure_intervals, tender_parameters): |
285 | 286 | return munchify({'data': test_tender_data_openeu(tender_parameters)}) |
286 | 287 | elif mode == 'openua': |
287 | 288 | return munchify({'data': test_tender_data_openua(tender_parameters)}) |
289 | + elif mode == 'open_competitive_dialogue': | |
290 | + return munchify({'data': test_tender_data_competitive_dialogue(tender_parameters)}) | |
288 | 291 | elif mode == 'reporting': |
289 | 292 | return munchify({'data': test_tender_data_limited(tender_parameters)}) |
290 | 293 | elif mode == 'belowThreshold': | ... | ... |
1 | +-s openProcedure | |
2 | + | |
3 | +-v mode:open_competitive_dialogue | |
4 | + | |
5 | +-v number_of_items:1 | |
6 | +-v number_of_lots:1 | |
7 | + | |
8 | +-v tender_meat:True | |
9 | +-v item_meat:True | |
10 | +-v lot_meat:True | |
11 | + | |
12 | + | |
13 | +-i create_tender | |
14 | +-i find_tender | |
15 | +-i tender_view | |
16 | +-i meat_view | |
17 | +-i lot_view | |
18 | + | |
19 | +-i extend_tendering_period | |
20 | +-i add_tender_doc | |
21 | +-i add_lot_doc | |
22 | +-i modify_lot_value_amount | |
23 | +-i add_lot | |
24 | + -i delete_lot | |
25 | +-i add_item | |
26 | + -i delete_item | |
27 | +-i add_tender_meat | |
28 | + -i delete_tender_meat | |
29 | +-i add_lot_meat | |
30 | + -i delete_lot_meat | |
31 | +-i add_item_meat | |
32 | + -i delete_item_meat | |
33 | + | |
34 | +-i ask_question_to_tender | |
35 | + -i answer_question_to_tender | |
36 | +-i ask_question_to_item | |
37 | + -i answer_question_to_item | |
38 | +-i ask_question_to_lot | |
39 | + -i answer_question_to_lot | |
40 | +-i modify_tender_after_questions | |
41 | +-i modify_lot_after_questions | |
42 | + | |
43 | +-i create_tender_claim | |
44 | + -i answer_tender_claim | |
45 | + -i resolve_tender_claim | |
46 | +-i modify_tender_after_claim | |
47 | + | |
48 | +-i create_lot_claim | |
49 | + -i answer_lot_claim | |
50 | + -i resolve_lot_claim | |
51 | +-i modify_lot_after_claim | |
52 | + | |
53 | +-i make_bid_without_related_lot | |
54 | +-i make_bid_without_parameters | |
55 | +-i make_bid_by_provider | |
56 | + -i modify_bid_by_provider | |
57 | + -i add_doc_to_bid_by_provider | |
58 | +-i make_bid_by_provider1 | |
59 | +-i bid_view_in_tendering_period | |
60 | + | |
61 | +-i add_bid_doc_after_tendering_period_by_provider | |
62 | +-i modify_bid_doc_after_tendering_period_by_provider | |
63 | +-i modify_bid_after_tendering_period_by_provider1 | |
64 | +-i cancel_bid_after_tendering_period_by_provider1 | |
65 | + | |
66 | +-i ask_question_to_tender_after_tendering_period | |
67 | +-i ask_question_to_item_after_tendering_period | |
68 | +-i ask_question_to_lot_after_tendering_period | |
69 | + | |
70 | +-i open_tender_view | |
71 | +-i open_modify_tender_in_tendering_period | |
72 | + -i open_confirm_first_bid | |
73 | + -i open_confirm_second_bid | |
74 | + | |
75 | +-i openeu_make_bid_doc_private_by_provider | |
76 | + | |
77 | +-i pre-qualification_add_doc_to_tender | |
78 | +-i pre-qualification_add_doc_to_lot | |
79 | + | |
80 | +-i pre-qualification_view | |
81 | + | |
82 | +-i pre-qualification_add_doc_to_first_bid | |
83 | +-i pre-qualification_approve_first_bid | |
84 | + | |
85 | +-i pre-qualification_add_doc_to_second_bid | |
86 | +-i pre-qualification_reject_second_bid | |
87 | + -i pre-qualification_cancel_second_bid_qualification | |
88 | +-i pre-qualification_approve_second_bid | |
89 | + | |
90 | +-i pre-qualification_approve_qualifications | |
91 | + | ... | ... |
Please
register
or
login
to post a comment