Commit 590de4048098d80b1fbff1a36dda8d210f06330c
1 parent
eec7fe2a
Upload documentation to requirement
Showing
4 changed files
with
15 additions
and
9 deletions
@@ -1004,7 +1004,7 @@ Resource playtender_agree | @@ -1004,7 +1004,7 @@ Resource playtender_agree | ||
1004 | 1004 | ||
1005 | Run Keyword And Return If '${SUITE_NAME}' == 'Contract Signing' Отримати документ до контракту ${username} ${tender_uaid} ${doc_id} | 1005 | Run Keyword And Return If '${SUITE_NAME}' == 'Contract Signing' Отримати документ до контракту ${username} ${tender_uaid} ${doc_id} |
1006 | open tender page by uaid ${tender_uaid} | 1006 | open tender page by uaid ${tender_uaid} |
1007 | - ${tender_new_doc_locator} = replace string ${tender_new_doc_contract_locator_tpl} %doc_id% ${doc_id} | 1007 | + ${tender_new_doc_locator} = replace string ${tender_new_doc_locator_tpl} %doc_id% ${doc_id} |
1008 | wait until page contains element with reloading ${tender_new_doc_locator} | 1008 | wait until page contains element with reloading ${tender_new_doc_locator} |
1009 | 1009 | ||
1010 | ${tender_new_doc__title_locator} = replace string ${tender_new_doc_contract_title_locator_tpl} %doc_id% ${doc_id} | 1010 | ${tender_new_doc__title_locator} = replace string ${tender_new_doc_contract_title_locator_tpl} %doc_id% ${doc_id} |
@@ -1020,7 +1020,7 @@ Resource playtender_agree | @@ -1020,7 +1020,7 @@ Resource playtender_agree | ||
1020 | ... директорію OUTPUT_DIR для перевірки вмісту цього файлу. | 1020 | ... директорію OUTPUT_DIR для перевірки вмісту цього файлу. |
1021 | 1021 | ||
1022 | open tender page by uaid ${tender_uaid} | 1022 | open tender page by uaid ${tender_uaid} |
1023 | - ${tender_new_doc_locator} = replace string ${tender_new_doc_locator_tpl} %doc_id% ${doc_id} | 1023 | + ${tender_new_doc_locator} = replace string ${tender_new_doc_contract_locator_tpl} %doc_id% ${doc_id} |
1024 | wait until page contains element with reloading ${tender_new_doc_locator} | 1024 | wait until page contains element with reloading ${tender_new_doc_locator} |
1025 | 1025 | ||
1026 | ${file_link} = Execute Javascript return $('#contracts-pjax div a.doc__link[href*="https://public-docs-staging.prozorro.gov.ua"]').attr("href") | 1026 | ${file_link} = Execute Javascript return $('#contracts-pjax div a.doc__link[href*="https://public-docs-staging.prozorro.gov.ua"]').attr("href") |
@@ -42,7 +42,7 @@ Resource playtender_claim | @@ -42,7 +42,7 @@ Resource playtender_claim | ||
42 | Run Keyword If '${doc_name}' != 'null' wait until page does not contain element ${popup_dynamic_form_loading_element_locator} | 42 | Run Keyword If '${doc_name}' != 'null' wait until page does not contain element ${popup_dynamic_form_loading_element_locator} |
43 | capture page screenshot | 43 | capture page screenshot |
44 | # Run Keyword If '${doc_name}' != 'null' submit current visible popup | 44 | # Run Keyword If '${doc_name}' != 'null' submit current visible popup |
45 | - submit form and check result ${claim_form_complaintform_submit_btn_locator} ${claim_form_submit_success_msg} ${tender_created_checker_element_locator} | 45 | + submit form and check result ${claim_form_complaintform_submit_btn_locator} ${claim_form_submit_success_msg} ${tender_created_checker_element_locator} ${true} |
46 | # Функция ожидания claim_uaid_text_locator соответствующей вимоги | 46 | # Функция ожидания claim_uaid_text_locator соответствующей вимоги |
47 | # click visible element ${claim_form_open_btn_locator} | 47 | # click visible element ${claim_form_open_btn_locator} |
48 | reload page | 48 | reload page |
@@ -374,12 +374,17 @@ Upload documentation to requirement | @@ -374,12 +374,17 @@ Upload documentation to requirement | ||
374 | capture page screenshot | 374 | capture page screenshot |
375 | 375 | ||
376 | Execute Javascript $('#tender-complaint-list a[href*="/tender-complaint/update"]').click() | 376 | Execute Javascript $('#tender-complaint-list a[href*="/tender-complaint/update"]').click() |
377 | + capture page screenshot | ||
377 | choose file ${add_file_to_complaint_form_locator} ${document} | 378 | choose file ${add_file_to_complaint_form_locator} ${document} |
378 | - ${add_file_to_complaint_title_locator} = replace string ${add_file_to_complaint_title_locator_tpl} %title% ${document} | 379 | + capture page screenshot |
380 | + sleep 3 | ||
381 | + ${doc_name} = playtender_service.split_docname ${document} | ||
382 | + ${add_file_to_complaint_title_locator} = replace string ${add_file_to_complaint_title_locator_tpl} %title% ${doc_name} | ||
379 | run keyword and ignore error wait until page does not contain element ${add_file_to_complaint_title_locator} | 383 | run keyword and ignore error wait until page does not contain element ${add_file_to_complaint_title_locator} |
380 | wait until element is visible ${add_file_to_complaint_title_locator} | 384 | wait until element is visible ${add_file_to_complaint_title_locator} |
381 | - click visible element ${select_add_file_to_complaint_success_btn_locator} | ||
382 | - submit form and check result ${select_add_file_to_complaint_success_btn_locator} ${select_add_file_to_complaint_submit_success_msg} | 385 | +# click visible element ${select_add_file_to_complaint_success_btn_locator} |
386 | + capture page screenshot | ||
387 | + submit form and check result ${select_add_file_to_complaint_success_btn_locator} ${select_add_file_to_complaint_submit_success_msg} ${true} | ||
383 | 388 | ||
384 | 389 | ||
385 | document to bid edit1 | 390 | document to bid edit1 |
@@ -65,6 +65,7 @@ ${select_complaint_success_btn_locator} = jquery=.anim | @@ -65,6 +65,7 @@ ${select_complaint_success_btn_locator} = jquery=.anim | ||
65 | ${select_complaint_submit2_success_msg} = Скарга успішно скасована. | 65 | ${select_complaint_submit2_success_msg} = Скарга успішно скасована. |
66 | 66 | ||
67 | ${add_file_to_complaint_form_locator} = jquery=#tender-complaint-update-form .js-upload-documents input[type$="file"] | 67 | ${add_file_to_complaint_form_locator} = jquery=#tender-complaint-update-form .js-upload-documents input[type$="file"] |
68 | -${add_file_to_complaint_title_locator_tpl} = jquery=.fancybox-slide .document-title-wrapper a[href*="uploads/complaint_documents/%title%"] | 68 | +${add_file_to_complaint_title_locator_tpl} = jquery=.fancybox-slide .document-title-wrapper a[href*="%title%"] |
69 | +#${add_file_to_complaint_title_locator_tpl} = jquery=.fancybox-slide .document-title-wrapper a[href*="uploads/complaint_documents/%title%"] | ||
69 | ${select_add_file_to_complaint_success_btn_locator} = jquery=.fancybox-slide .btn.btn-success | 70 | ${select_add_file_to_complaint_success_btn_locator} = jquery=.fancybox-slide .btn.btn-success |
70 | ${select_add_file_to_complaint_submit_success_msg} = Скарга успішно відредагована. | 71 | ${select_add_file_to_complaint_submit_success_msg} = Скарга успішно відредагована. |
@@ -213,8 +213,8 @@ ${tender_contracts_0_status_value_locator} = jquery=#cont | @@ -213,8 +213,8 @@ ${tender_contracts_0_status_value_locator} = jquery=#cont | ||
213 | ${tender_contracts_status_active_value_locator} = jquery=#contracts-pjax .tabs__pane--visible .status-source.hidden:contains(active) | 213 | ${tender_contracts_status_active_value_locator} = jquery=#contracts-pjax .tabs__pane--visible .status-source.hidden:contains(active) |
214 | ${tender_contracts_1_amountnet_value_locator} = jquery=#contracts-pjax .tender-contract-info-wrapper .amount-net-source.hidden | 214 | ${tender_contracts_1_amountnet_value_locator} = jquery=#contracts-pjax .tender-contract-info-wrapper .amount-net-source.hidden |
215 | ${tender_contracts_1_amount_value_locator} = jquery=#contracts-pjax .tender-contract-info-wrapper .amount-source.hidden | 215 | ${tender_contracts_1_amount_value_locator} = jquery=#contracts-pjax .tender-contract-info-wrapper .amount-source.hidden |
216 | -${tender_contracts_1_amountnet_value_locator_value_type} = float | ||
217 | -${tender_contracts_1_amount_value_locator_value_type} = float | 216 | +${tender_contracts_1_amountnet_value_value_type} = float |
217 | +${tender_contracts_1_amount_value_value_type} = float | ||
218 | ${tender_contracts_1_datesigned_value_locator} = jquery=#contracts-pjax .tender-contract-info-wrapper .date-signed-source.hidden | 218 | ${tender_contracts_1_datesigned_value_locator} = jquery=#contracts-pjax .tender-contract-info-wrapper .date-signed-source.hidden |
219 | 219 | ||
220 | ${wait_msg_contract} = Завантаження контракту буде | 220 | ${wait_msg_contract} = Завантаження контракту буде |
Please
register
or
login
to post a comment