Commit 68d9a0db39715bcd15f45fcb44a0a44bd1a0637d
1 parent
0089c2f2
fix framework 2-nd stage for plan-tender
Showing
4 changed files
with
31 additions
and
5 deletions
@@ -61,7 +61,7 @@ ${ERROR_MESSAGE}= Calling method 'get_tender' failed: ResourceGone: {"status": | @@ -61,7 +61,7 @@ ${ERROR_MESSAGE}= Calling method 'get_tender' failed: ResourceGone: {"status": | ||
61 | ${first_stage}= Run As ${provider2} Пошук тендера по ідентифікатору ${TENDER['TENDER_UAID']} | 61 | ${first_stage}= Run As ${provider2} Пошук тендера по ідентифікатору ${TENDER['TENDER_UAID']} |
62 | ${tender_data}= test_tender_data_selection ${period_intervals} ${tender_parameters} ${submissionMethodDetails} tender_data=${first_stage} | 62 | ${tender_data}= test_tender_data_selection ${period_intervals} ${tender_parameters} ${submissionMethodDetails} tender_data=${first_stage} |
63 | ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_data} | 63 | ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_data} |
64 | - ${TENDER_UAID}= Run As ${tender_owner} Створити тендер ${adapted_data} | 64 | + ${TENDER_UAID}= Run As ${tender_owner} Створити тендер другого етапу ${adapted_data} |
65 | Set To Dictionary ${USERS.users['${tender_owner}']} initial_data=${adapted_data} | 65 | Set To Dictionary ${USERS.users['${tender_owner}']} initial_data=${adapted_data} |
66 | Set To Dictionary ${TENDER} TENDER_UAID=${TENDER_UAID} | 66 | Set To Dictionary ${TENDER} TENDER_UAID=${TENDER_UAID} |
67 | Дочекатись дати початку періоду уточнення ${tender_owner} ${TENDER_UAID} | 67 | Дочекатись дати початку періоду уточнення ${tender_owner} ${TENDER_UAID} |
@@ -217,6 +217,28 @@ Library openprocurement_client.utils | @@ -217,6 +217,28 @@ Library openprocurement_client.utils | ||
217 | [return] ${tender.data.tenderID} | 217 | [return] ${tender.data.tenderID} |
218 | 218 | ||
219 | 219 | ||
220 | +Створити тендер другого етапу | ||
221 | + [Arguments] ${username} ${tender_data} | ||
222 | + ${tender}= Call Method ${USERS.users['${username}'].client} create_tender ${tender_data} | ||
223 | + Log ${tender} | ||
224 | + ${access_token}= Get Variable Value ${tender.access.token} | ||
225 | + ${status}= Set Variable If 'open' in '${MODE}' active.tendering ${EMPTY} | ||
226 | + ${status}= Set Variable If 'below' in '${MODE}' active.enquiries ${status} | ||
227 | + ${status}= Set Variable If 'selection' in '${MODE}' draft.pending ${status} | ||
228 | + ${status}= Set Variable If '${status}'=='${EMPTY}' active ${status} | ||
229 | + Set To Dictionary ${tender['data']} status=${status} | ||
230 | + ${tender}= Call Method ${USERS.users['${username}'].client} patch_tender | ||
231 | + ... ${tender.data.id} | ||
232 | + ... ${tender} | ||
233 | + ... access_token=${tender.access.token} | ||
234 | + Log ${tender} | ||
235 | + Log ${\n}${API_HOST_URL}/api/${API_VERSION}/tenders/${tender.data.id}${\n} WARN | ||
236 | + Set To Dictionary ${USERS.users['${username}']} access_token=${access_token} | ||
237 | + Set To Dictionary ${USERS.users['${username}']} tender_data=${tender} | ||
238 | + Log ${USERS.users['${username}'].tender_data} | ||
239 | + [return] ${tender.data.tenderID} | ||
240 | + | ||
241 | + | ||
220 | Створити об'єкт моніторингу | 242 | Створити об'єкт моніторингу |
221 | [Arguments] ${username} ${monitoring_data} | 243 | [Arguments] ${username} ${monitoring_data} |
222 | ${monitoring}= Call Method ${USERS.users['${username}'].dasu_client} create_monitoring ${monitoring_data} | 244 | ${monitoring}= Call Method ${USERS.users['${username}'].dasu_client} create_monitoring ${monitoring_data} |
@@ -729,17 +729,17 @@ def test_tender_data_competitive_dialogue(params, submissionMethodDetails, plan_ | @@ -729,17 +729,17 @@ def test_tender_data_competitive_dialogue(params, submissionMethodDetails, plan_ | ||
729 | return data | 729 | return data |
730 | 730 | ||
731 | 731 | ||
732 | -def test_tender_data_selection(procedure_intervals, params, submissionMethodDetails, tender_data=None): | 732 | +def test_tender_data_selection(procedure_intervals, params, submissionMethodDetails, tender_data=None, plan_data=None): |
733 | intervals = procedure_intervals['framework_selection'] | 733 | intervals = procedure_intervals['framework_selection'] |
734 | params['intervals'] = intervals | 734 | params['intervals'] = intervals |
735 | - data = test_tender_data(params, (), submissionMethodDetails) | 735 | + data = test_tender_data(params, plan_data, (), submissionMethodDetails) |
736 | data['title_en'] = "[TESTING]" | 736 | data['title_en'] = "[TESTING]" |
737 | data['procuringEntity'] = tender_data['data']['procuringEntity'] | 737 | data['procuringEntity'] = tender_data['data']['procuringEntity'] |
738 | del data['procuringEntity']['contactPoint']['availableLanguage'] | 738 | del data['procuringEntity']['contactPoint']['availableLanguage'] |
739 | data['procurementMethodType'] = 'closeFrameworkAgreementSelectionUA' | 739 | data['procurementMethodType'] = 'closeFrameworkAgreementSelectionUA' |
740 | data['items'] = tender_data['data']['items'] | 740 | data['items'] = tender_data['data']['items'] |
741 | data['lots'] = tender_data['data']['lots'] | 741 | data['lots'] = tender_data['data']['lots'] |
742 | - data['agreements'] = [{'id': tender_data['data']['agreements'][0]['id']}] | 742 | + data['agreements'] = [{'id': tender_data['data']['agreements'][0]['id']}] |
743 | del data['value'] | 743 | del data['value'] |
744 | del data['minimalStep'] | 744 | del data['minimalStep'] |
745 | return munchify({'data':data}) | 745 | return munchify({'data':data}) |
@@ -17,6 +17,7 @@ ${ITEM_MEAT} ${False} | @@ -17,6 +17,7 @@ ${ITEM_MEAT} ${False} | ||
17 | ${MOZ_INTEGRATION} ${False} | 17 | ${MOZ_INTEGRATION} ${False} |
18 | ${ROAD_INDEX} ${False} | 18 | ${ROAD_INDEX} ${False} |
19 | ${GMDN_INDEX} ${False} | 19 | ${GMDN_INDEX} ${False} |
20 | +${PLAN_TENDER} ${False} | ||
20 | 21 | ||
21 | *** Test Cases *** | 22 | *** Test Cases *** |
22 | Можливість оголосити тендер другого етапу | 23 | Можливість оголосити тендер другого етапу |
@@ -83,8 +84,11 @@ ${GMDN_INDEX} ${False} | @@ -83,8 +84,11 @@ ${GMDN_INDEX} ${False} | ||
83 | ... extend_tendering_period level3 | 84 | ... extend_tendering_period level3 |
84 | ... critical | 85 | ... critical |
85 | [Teardown] Оновити LAST_MODIFICATION_DATE | 86 | [Teardown] Оновити LAST_MODIFICATION_DATE |
86 | - Можливість продовжити період подання пропозиції на ${10} днів | 87 | + ${endDate}= add_minutes_to_date ${USERS.users['${tender_owner}'].tender_data.data.tenderPeriod.endDate} 10 |
88 | + Можливість змінити поле tenderPeriod.endDate тендера на ${endDate} | ||
87 | Remove From Dictionary ${USERS.users['${tender_owner}'].tender_data.data.tenderPeriod} endDate | 89 | Remove From Dictionary ${USERS.users['${tender_owner}'].tender_data.data.tenderPeriod} endDate |
90 | + #Можливість продовжити період подання пропозиції на ${10} днів | ||
91 | + #Remove From Dictionary ${USERS.users['${tender_owner}'].tender_data.data.tenderPeriod} endDate | ||
88 | 92 | ||
89 | 93 | ||
90 | Можливість змінити кількість одиниць в предметі закупівлі | 94 | Можливість змінити кількість одиниць в предметі закупівлі |
Please
register
or
login
to post a comment