Commit 0097a23f1c5eebb88e4c231046fd214855434c52
1 parent
595af748
fix for fix awards data in global Users variable and negotiation document for award
Showing
2 changed files
with
5 additions
and
5 deletions
@@ -149,7 +149,7 @@ Resource playtender_contr | @@ -149,7 +149,7 @@ Resource playtender_contr | ||
149 | [Documentation] Отримати значення поля field_name для тендера tender_uaid. | 149 | [Documentation] Отримати значення поля field_name для тендера tender_uaid. |
150 | 150 | ||
151 | # fix for preventing error "Resolving variable '${award.value.amount}' failed: AttributeError: value" in next keywords for owner role | 151 | # fix for preventing error "Resolving variable '${award.value.amount}' failed: AttributeError: value" in next keywords for owner role |
152 | - run keyword if ${is_test_role_owner} and '${field_name}' == 'awards[0].complaintPeriod.endDate' fix awards data in global Users variable ${username} | 152 | + 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} |
153 | 153 | ||
154 | open tender page by uaid ${tender_uaid} | 154 | open tender page by uaid ${tender_uaid} |
155 | wait until page does not contain element with reloading ${tender_sync_element_locator} | 155 | wait until page does not contain element with reloading ${tender_sync_element_locator} |
@@ -721,7 +721,7 @@ Resource playtender_contr | @@ -721,7 +721,7 @@ Resource playtender_contr | ||
721 | open tender form by uaid ${tender_uaid} | 721 | open tender form by uaid ${tender_uaid} |
722 | fill tender from award reporting ${supplier_data.data.value.amount} ${supplier_data.data.suppliers[0]} | 722 | fill tender from award reporting ${supplier_data.data.value.amount} ${supplier_data.data.suppliers[0]} |
723 | run keyword and ignore error save tender form and wait synchronization | 723 | run keyword and ignore error save tender form and wait synchronization |
724 | - confirm award | 724 | + confirm award ${document} |
725 | ######################################################################################################################## | 725 | ######################################################################################################################## |
726 | ################################################### END LIMITED PROCUREMENT KEYWORDS ################################## | 726 | ################################################### END LIMITED PROCUREMENT KEYWORDS ################################## |
727 | ######################################################################################################################## | 727 | ######################################################################################################################## |
@@ -243,6 +243,7 @@ cancel award qualification | @@ -243,6 +243,7 @@ cancel award qualification | ||
243 | 243 | ||
244 | #qualification awawd reporting and negotiotion | 244 | #qualification awawd reporting and negotiotion |
245 | confirm award | 245 | confirm award |
246 | + [Arguments] ${document} | ||
246 | [Documentation] Перевести постачальника в статус active. | 247 | [Documentation] Перевести постачальника в статус active. |
247 | 248 | ||
248 | run keyword and ignore error run keyword if '${mode}' in 'negotiation reporting' Wait Until Page Contains ${award_form_negotiation_submit_success_msg} 60 | 249 | run keyword and ignore error run keyword if '${mode}' in 'negotiation reporting' Wait Until Page Contains ${award_form_negotiation_submit_success_msg} 60 |
@@ -250,19 +251,18 @@ confirm award | @@ -250,19 +251,18 @@ confirm award | ||
250 | run keyword and ignore error run keyword if '${mode}' in 'negotiation reporting' close current visible alert | 251 | run keyword and ignore error run keyword if '${mode}' in 'negotiation reporting' close current visible alert |
251 | 252 | ||
252 | capture page screenshot | 253 | capture page screenshot |
253 | - capture page screenshot | ||
254 | wait until page contains element with reloading ${qualification_form_0_open_btn_locator} | 254 | wait until page contains element with reloading ${qualification_form_0_open_btn_locator} |
255 | click visible element ${qualification_form_0_open_btn_locator} | 255 | click visible element ${qualification_form_0_open_btn_locator} |
256 | Wait Until Page Contains ${popup_opened_content_success_locator} 60 | 256 | Wait Until Page Contains ${popup_opened_content_success_locator} 60 |
257 | run keyword and ignore error wait until element is visible ${tender_status_active_qualification_value_locator} 10 | 257 | run keyword and ignore error wait until element is visible ${tender_status_active_qualification_value_locator} 10 |
258 | wait until element is visible ${qualification_form_submit_btn_locator} 60 | 258 | wait until element is visible ${qualification_form_submit_btn_locator} 60 |
259 | - ${file_path} ${file_name} ${file_content} = create_fake_doc | 259 | +# ${file_path} ${file_name} ${file_content} = create_fake_doc |
260 | Execute Javascript $('#qualificationform-decision').val('accept').change() | 260 | Execute Javascript $('#qualificationform-decision').val('accept').change() |
261 | capture page screenshot | 261 | capture page screenshot |
262 | run keyword and ignore error wait until page contains element ${award_form_qualified_input_locator} | 262 | run keyword and ignore error wait until page contains element ${award_form_qualified_input_locator} |
263 | capture page screenshot | 263 | capture page screenshot |
264 | run keyword and ignore error click visible element ${award_form_qualified_input_locator} | 264 | run keyword and ignore error click visible element ${award_form_qualified_input_locator} |
265 | - choose file ${add_file_to_qualification_form_locator} ${file_path} | 265 | + choose file ${add_file_to_qualification_form_locator} ${document} |
266 | wait until page does not contain element ${popup_dynamic_form_loading_element_locator} 60 | 266 | wait until page does not contain element ${popup_dynamic_form_loading_element_locator} 60 |
267 | wait until element is visible ${qualification_form_add_document_type_input_locator} 60 | 267 | wait until element is visible ${qualification_form_add_document_type_input_locator} 60 |
268 | # submit current visible popup | 268 | # submit current visible popup |
Please
register
or
login
to post a comment