Administrator / playtender-robot_tests · Commits

Commit 6c9eb460de5e4c61f464d52ea660bba2e32e92d2

Authored by Oleksandr Iskryzhytskyi
2 parents 0be831dd 3d0e2334
build: skipped

Merge branch 'v3-dev' of https://git.4k.com.ua/root/playtender-robot_tests into v3-dev

Inline Side-by-side
Showing 5 changed files with 20 additions and 22 deletions
... ... @@ -508,9 +508,9 @@ __private__select_classification_code_in_opened_popup
508 508 click visible element ${code_item_locator}
509 509
510 510 Load Sign
511   - ${loadingfakeKey} = Run keyword And Return Status Wait Until Page Contains Це фейкове накладання ЕЦП 90
  511 + ${loadingfakeKey} = Run keyword And Return Status Wait Until Page Contains Це фейкове накладання ЕЦП 30
512 512 run keyword and ignore error Run Keyword If ${loadingfakeKey} == True submit form and check result id=SignDataButton ${qualification_ecp_form_submit_success_msg}
513   - ${loadingKey} = Run keyword And Return Status Wait Until Page Contains Серійний номер 90
  513 + ${loadingKey} = Run keyword And Return Status Wait Until Page Contains Серійний номер 30
514 514 Run Keyword If ${loadingfakeKey} == True Fail Далі не ходити
515 515 Run Keyword If ${loadingKey} == False Load Sign Data
516 516 Wait Until Page Contains Серійний номер 60
... ...
... ... @@ -15,8 +15,8 @@ edit contract
15 15 Run Keyword If '${TEST_NAME}' == 'Неможливість вказати ціну договору з ПДВ більше ніж результат проведення аукціону' and '${mode}' not in 'open_esco' Fail Amount should be less or equal to awarded amount
16 16 Run Keyword If '${TEST_NAME}' == 'Неможливість вказати ціну договору з ПДВ більше ніж результат проведення аукціону' and '${mode}' in 'open_esco' Fail Can't update amount for contract value
17 17 Run Keyword If '${TEST_NAME}' == 'Неможливість зменшити ціну договору без ПДВ на суму більшу за 20% від ціни договору з ПДВ (закупівля з ПДВ)' Fail Amount should be greater than amountNet and differ by no more than 20.0%
18   - ${complaint_period_end_date} = get value by locator on opened page ${tender_awards_complaintPeriod_endDate_value_locator}
19   - Wait date ${complaint_period_end_date}
  18 + ${complaint_period_end_date} = run keyword if '${mode}' not in 'reporting' get value by locator on opened page ${tender_awards_complaintPeriod_endDate_value_locator}
  19 + run keyword if '${mode}' not in 'reporting' Wait date ${complaint_period_end_date}
20 20 click visible element ${contract_form_0_open_btn_locator}
21 21 Run Keyword And Ignore Error Wait Until Page Contains ${contract_contractform_contract_number_input_locator} 10
22 22 run keyword and ignore error wait until element is visible ${tender_status_active_qualification_value_locator} 5
... ...
... ... @@ -228,24 +228,21 @@ confirm award
228 228 [Arguments] ${document}
229 229 [Documentation] Перевести постачальника в статус active.
230 230
231   - run keyword and ignore error run keyword if '${mode}' in 'negotiation reporting' Wait Until Page Contains ${award_form_negotiation_submit_success_msg} 60
232   - run keyword and ignore error run keyword if '${mode}' in 'negotiation reporting' wait until alert is visible ${award_form_negotiation_submit_success_msg}
  231 + run keyword and ignore error run keyword if '${mode}' in 'negotiation reporting' Wait Until Page Contains ${award_form_negotiation_submit_success_msg} 10
  232 +# run keyword and ignore error run keyword if '${mode}' in 'negotiation reporting' wait until alert is visible ${award_form_negotiation_submit_success_msg}
233 233 run keyword and ignore error run keyword if '${mode}' in 'negotiation reporting' close current visible alert
234 234
235 235 capture page screenshot
236 236 wait until page contains element with reloading ${qualification_form_0_open_btn_locator}
237 237 open popup by btn locator ${qualification_form_0_open_btn_locator}
238   - Wait Until Page Contains ${popup_opened_content_success_locator} 60
239   - run keyword and ignore error wait until element is visible ${tender_status_active_qualification_value_locator} 10
240   - wait until element is visible ${qualification_form_submit_btn_locator} 60
241 238 # ${file_path} ${file_name} ${file_content} = create_fake_doc
242 239 Execute Javascript $('#qualificationform-decision').val('accept').change()
243 240 capture page screenshot
244   - run keyword and ignore error wait until page contains element ${award_form_qualified_input_locator}
  241 +# run keyword and ignore error wait until page contains element ${award_form_qualified_input_locator}
245 242 capture page screenshot
246 243 run keyword and ignore error click visible element ${award_form_qualified_input_locator}
247 244 choose file ${add_file_to_qualification_form_locator} ${document}
248   - wait until page does not contain element ${popup_dynamic_form_loading_element_locator} 60
  245 +# wait until page does not contain element ${popup_dynamic_form_loading_element_locator} 60
249 246 wait until element is visible ${qualification_form_add_document_type_input_locator} 60
250 247 # submit current visible popup
251 248
... ... @@ -259,20 +256,20 @@ confirm award
259 256 click visible element ${qualification_form_add_document_close_description_btn_locator}
260 257 capture page screenshot
261 258
262   - run keyword and ignore error click visible element ${qualification_ecp_check_input_locator}
  259 +# run keyword and ignore error run keyword if '${mode}' in 'reporting' submit form and check result ${qualification_form_submit_btn_locator} ${qualification_award_form_submit_success_msg}
263 260 capture page screenshot
264   - run keyword and ignore error run keyword if '${mode}' in 'reporting' submit form and check result ${qualification_form_submit_btn_locator} ${qualification_award_form_submit_success_msg}
  261 +# run keyword and ignore error run keyword if '${mode}' in 'reporting' wait until page contains element with reloading ${qualification_form_0_open_btn_locator}
265 262 capture page screenshot
266   - run keyword and ignore error run keyword if '${mode}' in 'reporting' wait until page contains element with reloading ${qualification_form_0_open_btn_locator}
  263 +# run keyword and ignore error run keyword if '${mode}' in 'reporting' open popup by btn locator ${qualification_form_0_open_btn_locator}
267 264 capture page screenshot
268   - run keyword and ignore error run keyword if '${mode}' in 'reporting' open popup by btn locator ${qualification_form_0_open_btn_locator}
269   - capture page screenshot
270   - run keyword and ignore error run keyword if '${mode}' in 'reporting' Execute Javascript $('#qualificationform-decision').val('accept').change()
  265 +# run keyword and ignore error run keyword if '${mode}' in 'reporting' Execute Javascript $('#qualificationform-decision').val('accept').change()
271 266 capture page screenshot
272 267 run keyword and ignore error submit form and check result ${qualification_form_submit_btn_locator} ${qualification_award_form_submit_success_msg} ${qualification_form_submit_btn_locator}
273 268 capture page screenshot
  269 + run keyword and ignore error click visible element ${qualification_ecp_check_input_locator}
  270 + capture page screenshot
274 271 wait until element is visible ${qualification_form_submit_btn_locator} 60
275   -## run keyword and ignore error submit form and check result ${qualification_form_submit_btn_locator} ${None} ${qualification_ecp_form_open_locator}
  272 +# run keyword and ignore error submit form and check result ${qualification_form_submit_btn_locator} ${None} ${qualification_ecp_form_open_locator}
276 273 Execute Javascript $('.fancybox-is-open .fancybox-content button.btn.btn-success').click()
277 274 # click visible element ${qualification_form_submit_btn_locator}
278 275 capture page screenshot
... ...
... ... @@ -55,7 +55,8 @@ ${qualification_form_cancel_input_locator} = $('#qualific
55 55 ${qualification_form_add_document_type_input_locator} = jquery=.js-dynamic-form-content-item:last .document-type select[id*="-document_type"]
56 56 ${qualification_form_add_document_description_btn_locator} = jquery=.js-dynamic-form-content-item:last [href$="#edit"]:last
57 57 ${qualification_form_add_document_description_input_locator} = jquery=.js-dynamic-form-content-item:last .popover.fade.top.in textarea[id*="-description"].form-control
58   -${qualification_form_add_document_close_description_btn_locator} = jquery=.js-dynamic-form-content-item:last .popover.fade.top.in [href$="#close"]
  58 +${qualification_form_add_document_close_description_btn_locator} = jquery=#qualification-documents .js-actions-wrapper:last .popover.fade.top.in [href$="#close"]
  59 +#${qualification_form_add_document_close_description_btn_locator} = jquery=.js-dynamic-form-content-item:last .popover.fade.top.in [href$="#close"]
59 60
60 61 #award reporting and negotiotion
61 62 ${award_form_qualified_input_locator} = jquery=#qualificationform-qualified
... ...
... ... @@ -307,9 +307,9 @@ ${tender_form_general_panel_edit_btn_locator} = jquery=#Gene
307 307 ${tender_form_general_panel_draft_mode_input_locator} = jquery=[id*="-draft_mode"]
308 308 ${tender_form_general_panel_document_stage2_input_locator} = jquery=#collapseGeneral .actions-wrapper .js-btn-add-form-popup-panel[data-attribute="documents"]
309 309 ${stage2_form_add_document_type_input_locator} = jquery=.js-dynamic-form-content-item:last .document-type select[id*="-document_type"]
310   -${stage2_form_add_document_description_btn_locator} = jquery=.js-dynamic-form-content-item:last [href$="#edit"]:last
311   -${stage2_form_add_document_description_input_locator} = jquery=.js-dynamic-form-content-item:last .popover.fade.top.in textarea[id*="-description"].form-control
312   -${stage2_form_add_document_close_description_btn_locator} = jquery=.js-dynamic-form-content-item:last .popover.fade.top.in [href$="#close"]
  310 +${stage2_form_add_document_description_btn_locator} = jquery=.js-dynamic-form-content-item:last [href$="#edit"]:last
  311 +${stage2_form_add_document_description_input_locator} = jquery=.js-dynamic-form-content-item:last .popover.fade.top.in textarea[id*="-description"].form-control
  312 +${stage2_form_add_document_close_description_btn_locator} = jquery=.js-dynamic-form-content-item:last .popover.fade.top.in [href$="#close"]
313 313
314 314
315 315
... ...
Please register or login to post a comment