Showing
3 changed files
with
57 additions
and
5 deletions
... | ... | @@ -207,6 +207,7 @@ Resource playtender_agree |
207 | 207 | # fix for preventing error "Resolving variable '${award.value.amount}' failed: AttributeError: value" in next keywords for owner role |
208 | 208 | ## run keyword if ${is_test_role_owner} and '${field_name}' in 'awards[0].complaintPeriod.endDate awards[1].complaintPeriod.endDate awards[2].complaintPeriod.endDate awards[3].complaintPeriod.endDate' fix awards data in global Users variable ${username} |
209 | 209 | |
210 | + run keyword if '${field_name}' == 'maxAwardsCount' submit form and check result ${bid_form_refresh_btn_locator} ${bid_form_refresh_success_msg} ${tender_created_checker_element_locator} ${true} | |
210 | 211 | Run Keyword And Return If '${field_name}' == 'budget.amount' playtender.Отримати інформацію із плану ${username} ${tender_uaid} ${field_name} |
211 | 212 | open tender page by uaid ${tender_uaid} |
212 | 213 | Run Keyword And Return If '${field_name}' == 'lots[0].minimalStep.currency' Отримати інформацію із лоту minimalStep.currency ${field_name} |
... | ... | @@ -214,7 +215,7 @@ Resource playtender_agree |
214 | 215 | Run Keyword And Return If '${field_name}' == 'lots[0].value.valueAddedTaxIncluded' Отримати інформацію із лоту value.valueAddedTaxIncluded ${field_name} |
215 | 216 | Run Keyword And Return If '${field_name}' == 'lots[0].title' Отримати інформацію із лоту title ${field_name} |
216 | 217 | Run Keyword And Return If '${field_name}' == 'lots[0].description' Отримати інформацію із лоту description ${field_name} |
217 | - Run Keyword And Return If '${field_name}' == 'value.valueAddedTaxIncluded' Отримати інформацію із value.valueAddedTaxIncluded ${field_name} | |
218 | + Run Keyword And Return If '${field_name}' == 'value.valueAddedTaxIncluded' Отримати інформацію із value.valueAddedTaxIncluded | |
218 | 219 | Run Keyword And Return If '${field_name}' == 'complaintPeriod.endDate' Отримати інформацію із complaintPeriod.endDate |
219 | 220 | Run Keyword And Return If '${field_name}' == 'items[0].deliveryLocation.latitude' Fail Поле не відображаем |
220 | 221 | run keyword if '${field_name}' == 'status' wait for tender status |
... | ... | @@ -231,6 +232,8 @@ Resource playtender_agree |
231 | 232 | Run Keyword And Return If '${field_name}' == 'lots[0].value.amount' Отримати інформацію із lots[0].value.amount |
232 | 233 | Run Keyword And Return If '${field_name}' == 'lots[0].minimalStep.amount' Отримати інформацію із lots[0].minimalStep.amount |
233 | 234 | Run Keyword And Return If '${field_name}' == 'contracts[1].value.amountNet' Отримати інформацію із contracts[1].value.amountNet |
235 | + Run Keyword And Return If '${field_name}' == 'contracts[1].value.amount' Отримати інформацію із contracts[1].value.amount | |
236 | + Run Keyword And Return If '${field_name}' == 'contracts[1].value.dateSigned' Отримати інформацію із contracts[1].dateSigned | |
234 | 237 | # Run Keyword And Return If '${field_name}' == 'budget.amount' Отримати інформацію із плану ${username} ${tender_uaid} ${field_name} |
235 | 238 | ${field_name} = set variable tender.${field_name}.value |
236 | 239 | ${value} = get field_value by field_name on opened page ${field_name} |
... | ... | @@ -955,15 +958,32 @@ Resource playtender_agree |
955 | 958 | [Documentation] Завантажити файл з doc_id в заголовку для тендера tender_uaid в |
956 | 959 | ... директорію OUTPUT_DIR для перевірки вмісту цього файлу. |
957 | 960 | |
961 | + Run Keyword And Return If '${SUITE_NAME}' == 'Contract Signing' Отримати документ до контракту ${username} ${tender_uaid} ${doc_id} | |
958 | 962 | open tender page by uaid ${tender_uaid} |
959 | - ${tender_new_doc_locator} = replace string ${tender_new_doc_locator_tpl} %doc_id% ${doc_id} | |
963 | + ${tender_new_doc_locator} = replace string ${tender_new_doc_contract_locator_tpl} %doc_id% ${doc_id} | |
960 | 964 | wait until page contains element with reloading ${tender_new_doc_locator} |
961 | 965 | |
966 | + ${tender_new_doc__title_locator} = replace string ${tender_new_doc_contract_title_locator_tpl} %doc_id% ${doc_id} | |
967 | + | |
962 | 968 | ${file_link} = Execute Javascript return $('.docs__list .docs__item.js-item:first a.doc__link[href*="https://public-docs-staging.prozorro.gov.ua"]').val('.docs__list .docs__item.js-item:first a.doc__link[href*="https://public-docs-staging.prozorro.gov.ua"]').attr("href") |
963 | 969 | ${file_name} = get text ${tender_new_doc_locator} |
964 | 970 | download_file ${file_link} ${file_name} ${OUTPUT_DIR} |
965 | 971 | [return] ${file_name} |
966 | 972 | |
973 | +Отримати документ до контракту | |
974 | + [Arguments] ${username} ${tender_uaid} ${doc_id} | |
975 | + [Documentation] Завантажити файл з doc_id в заголовку для тендера tender_uaid в | |
976 | + ... директорію OUTPUT_DIR для перевірки вмісту цього файлу. | |
977 | + | |
978 | + open tender page by uaid ${tender_uaid} | |
979 | + ${tender_new_doc_locator} = replace string ${tender_new_doc_locator_tpl} %doc_id% ${doc_id} | |
980 | + wait until page contains element with reloading ${tender_new_doc_locator} | |
981 | + | |
982 | + ${file_link} = Execute Javascript return $('#contracts-pjax div a.doc__link[href*="https://public-docs-staging.prozorro.gov.ua"]').attr("href") | |
983 | + ${file_name} = get text ${tender_new_doc_locator} | |
984 | + download_file ${file_link} ${file_name} ${OUTPUT_DIR} | |
985 | + [return] ${file_name} | |
986 | + | |
967 | 987 | |
968 | 988 | Отримати документ до лоту |
969 | 989 | [Arguments] ${username} ${tender_uaid} ${lot_id} ${doc_id} | ... | ... |
... | ... | @@ -355,6 +355,7 @@ get value from lot |
355 | 355 | [Arguments] ${doc_id} |
356 | 356 | [Documentation] Отримати значення поля title з документу з doc_id в описі для тендера tender_uaid. |
357 | 357 | |
358 | + Run Keyword And Return If '${SUITE_NAME}' == 'Contract Signing' Отримати інформацію із документа title контракту ${doc_id} | |
358 | 359 | #заготовка |
359 | 360 | ${tender_new_doc_locator} = replace string ${tender_new_doc_locator_tpl} %doc_id% ${doc_id} |
360 | 361 | wait until page contains element with reloading ${tender_new_doc_locator} |
... | ... | @@ -366,6 +367,19 @@ get value from lot |
366 | 367 | #${return_value} = get value by locator on opened page ${tender_new_doc_locator} |
367 | 368 | [return] ${return_value} |
368 | 369 | |
370 | +Отримати інформацію із документа title контракту | |
371 | + [Arguments] ${doc_id} | |
372 | + [Documentation] Отримати значення поля title з документу контракту з doc_id в описі для тендера tender_uaid. | |
373 | + | |
374 | +#заготовка | |
375 | + ${tender_new_doc_locator} = replace string ${tender_new_doc_contract_locator_tpl} %doc_id% ${doc_id} | |
376 | + wait until page contains element with reloading ${tender_new_doc_locator} | |
377 | + | |
378 | + ${tender_new_doc__title_locator} = replace string ${tender_new_doc_contract_title_locator_tpl} %doc_id% ${doc_id} | |
379 | + | |
380 | + ${return_value} = Execute Javascript return ${tender_new_doc__title_locator} | |
381 | + [return] ${return_value} | |
382 | + | |
369 | 383 | wait for tender status |
370 | 384 | [Documentation] Очикування відповідного статусу закупівлі, в залежності від кейворда |
371 | 385 | |
... | ... | @@ -484,7 +498,19 @@ Wait For QualificationsPeriodEnd |
484 | 498 | Отримати інформацію із contracts[1].value.amountNet |
485 | 499 | [Documentation] Отримати значення поля contracts[1].value.amountNet |
486 | 500 | |
487 | - ${return_value} = get value by locator on opened page ${tender_contracts_0_status_value_locator} | |
501 | + ${return_value} = get value by locator on opened page ${tender_contracts_1_amountnet_value_locator} | |
502 | + [return] ${return_value} | |
503 | + | |
504 | +Отримати інформацію із contracts[1].value.amount | |
505 | + [Documentation] Отримати значення поля contracts[1].value.amount | |
506 | + | |
507 | + ${return_value} = get value by locator on opened page ${tender_contracts_1_amount_value_locator} | |
508 | + [return] ${return_value} | |
509 | + | |
510 | +Отримати інформацію із contracts[1].dateSigned | |
511 | + [Documentation] Отримати значення поля contracts[1].dateSigned | |
512 | + | |
513 | + ${return_value} = get value by locator on opened page ${tender_contracts_1_datesigned_value_locator} | |
488 | 514 | [return] ${return_value} |
489 | 515 | |
490 | 516 | Wait For contractactive |
... | ... | @@ -578,7 +604,8 @@ Wait date |
578 | 604 | Отримати інформацію із agreementDuration |
579 | 605 | [Documentation] Отримати значення поля agreementDuration для тендера tender_uaid. |
580 | 606 | |
581 | - ${return_value} = get value by locator on opened page ${tender_agreementduration_value_locator} | |
607 | + ${return_value} = get value by locator on opened page ${tender_agreement_duration_value_locator} | |
608 | +# ${return_value} = get value by locator on opened page ${tender_agreementduration_value_locator} | |
582 | 609 | [return] ${return_value} |
583 | 610 | |
584 | 611 | Отримати інформацію із agreements[0].agreementID | ... | ... |
... | ... | @@ -106,6 +106,8 @@ ${tender_auctionPeriod_startDate_value_locator} = jquery=#tend |
106 | 106 | ${tender_auctionPeriod_endDate_value_locator} = jquery=#tender-general-info .auction-end-date.hidden |
107 | 107 | ${tender_lots_0_auctionPeriod_endDate_value_locator} = jquery=#tender-general-info .auction-end-date.hidden |
108 | 108 | |
109 | +${tender_new_doc_contract_locator_tpl} = jquery=#contracts-pjax div[data-title*="%doc_id%"] | |
110 | +${tender_new_doc_contract_title_locator_tpl} = $('#contracts-pjax div[data-title*="%doc_id%"]').attr("data-title") | |
109 | 111 | |
110 | 112 | #wait for status |
111 | 113 | ${tender_status_active_tendering_value_locator} = xpath=//*[contains(text(), "active.tendering")] |
... | ... | @@ -208,6 +210,9 @@ ${tender_awards_0_status_value_locator} = jquery=.awar |
208 | 210 | #${tender_contracts_0_status_value_locator} = jquery=#contracts-pjax .tabs__pane--visible .definitions__item--offset-big .badge__text |
209 | 211 | ${tender_contracts_0_status_value_locator} = jquery=#contracts-pjax .tabs__pane--visible .status-source.hidden |
210 | 212 | ${tender_contracts_status_active_value_locator} = jquery=#contracts-pjax .tabs__pane--visible .status-source.hidden:contains(active) |
213 | +${tender_contracts_1_amountnet_value_locator} = jquery=#contracts-pjax .tender-contract-info-wrapper .amount-net-source.hidden | |
214 | +${tender_contracts_1_amount_value_locator} = jquery=#contracts-pjax .tender-contract-info-wrapper .amount-source.hidden | |
215 | +${tender_contracts_1_datesigned_value_locator} = jquery=#contracts-pjax .tender-contract-info-wrapper .date-signed-source.hidden | |
211 | 216 | |
212 | 217 | ${wait_msg_contract} = Завантаження контракту буде |
213 | 218 | |
... | ... | @@ -218,7 +223,7 @@ ${tender_agreementDuration_value_locator} = jquery=#tend |
218 | 223 | ${tender_agreements_0_status_value_locator} = jquery=.tabs__pane--visible[id*="tab-agreement-contract"] .status-source.hidden |
219 | 224 | ${tender_agreements_status_active_value_locator} = jquery=.tabs__pane--visible[id*="tab-agreement-contract"] .status-source.hidden:contains(active) |
220 | 225 | |
221 | -${tender_agreementduration_value_locator} = jquery=#tender-general-info .agreement-duration-source.hidden | |
226 | +${tender_agreement_duration_value_locator} = jquery=#tender-general-info .agreement-duration-source.hidden | |
222 | 227 | ${tender_agreement_agreementid_value_locator} = jquery=#agreement-contracts-list .agreement-info-wrapper.info-wrapper .agreement-id .value |
223 | 228 | ${tender_agreement_items0_quantity_value_locator} = jquery=.item-item-wrapper .hidden.info-wrapper .quantity-source |
224 | 229 | ${tender_agreement_lots0_value_amount_value_locator} = jquery=.tabs__pane--lot.tabs__pane--visible .lot-info-wrapper .budget-source.hidden | ... | ... |
Please
register
or
login
to post a comment