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

Oleksandr Iskryzhytskyi
2 parents 0be831dd 3d0e2334
Showing 5 changed files with 20 additions and 22 deletions
playtender_common.robot
playtender_contract.robot
playtender_qualification.robot
playtender_qualification_variables.robot
playtender_variables.robot
--- a/playtender_common.robot
View file @6c9eb46
+++ b/playtender_common.robot
View file @6c9eb46
@@ -508,9 +508,9 @@ __private__select_classification_code_in_opened_popup
     click visible element                                       ${code_item_locator}
 Load Sign
-    ${loadingfakeKey} =                                         Run keyword And Return Status  Wait Until Page Contains   Це фейкове накладання ЕЦП   90
+    ${loadingfakeKey} =                                         Run keyword And Return Status  Wait Until Page Contains   Це фейкове накладання ЕЦП   30
     run keyword and ignore error                                Run Keyword If  ${loadingfakeKey} == True  submit form and check result  id=SignDataButton  ${qualification_ecp_form_submit_success_msg}
-    ${loadingKey} =                                             Run keyword And Return Status  Wait Until Page Contains   Серійний номер   90
+    ${loadingKey} =                                             Run keyword And Return Status  Wait Until Page Contains   Серійний номер   30
     Run Keyword If                                              ${loadingfakeKey} == True  Fail   Далі не ходити
     Run Keyword If                                              ${loadingKey} == False  Load Sign Data
     Wait Until Page Contains                                    Серійний номер   60
--- a/playtender_contract.robot
View file @6c9eb46
+++ b/playtender_contract.robot
View file @6c9eb46
@@ -15,8 +15,8 @@ edit contract
     Run Keyword If                                              '${TEST_NAME}' == 'Неможливість вказати ціну договору з ПДВ більше ніж результат проведення аукціону' and '${mode}' not in 'open_esco'  Fail   Amount should be less or equal to awarded amount
     Run Keyword If                                              '${TEST_NAME}' == 'Неможливість вказати ціну договору з ПДВ більше ніж результат проведення аукціону' and '${mode}' in 'open_esco'  Fail   Can't update amount for contract value
     Run Keyword If                                              '${TEST_NAME}' == 'Неможливість зменшити ціну договору без ПДВ на суму більшу за 20% від ціни договору з ПДВ (закупівля з ПДВ)'  Fail   Amount should be greater than amountNet and differ by no more than 20.0%
-    ${complaint_period_end_date} =                              get value by locator on opened page  ${tender_awards_complaintPeriod_endDate_value_locator}
-    Wait date                                                   ${complaint_period_end_date}
+    ${complaint_period_end_date} =                              run keyword if  '${mode}' not in 'reporting'  get value by locator on opened page  ${tender_awards_complaintPeriod_endDate_value_locator}
+    run keyword if  '${mode}' not in 'reporting'                Wait date                                                   ${complaint_period_end_date}
     click visible element                                       ${contract_form_0_open_btn_locator}
     Run Keyword And Ignore Error                                Wait Until Page Contains                                    ${contract_contractform_contract_number_input_locator}  10
     run keyword and ignore error                                wait until element is visible  ${tender_status_active_qualification_value_locator}  5
--- a/playtender_qualification.robot
View file @6c9eb46
+++ b/playtender_qualification.robot
View file @6c9eb46
@@ -228,24 +228,21 @@ confirm award
     [Arguments]                                                 ${document}
     [Documentation]                                             Перевести постачальника в статус active.
-    run keyword and ignore error                                run keyword if  '${mode}' in 'negotiation reporting'  Wait Until Page Contains  ${award_form_negotiation_submit_success_msg}  60
-    run keyword and ignore error                                run keyword if  '${mode}' in 'negotiation reporting'  wait until alert is visible  ${award_form_negotiation_submit_success_msg}
+    run keyword and ignore error                                run keyword if  '${mode}' in 'negotiation reporting'  Wait Until Page Contains  ${award_form_negotiation_submit_success_msg}  10
+#    run keyword and ignore error                                run keyword if  '${mode}' in 'negotiation reporting'  wait until alert is visible  ${award_form_negotiation_submit_success_msg}
     run keyword and ignore error                                run keyword if  '${mode}' in 'negotiation reporting'  close current visible alert
     capture page screenshot
     wait until page contains element with reloading             ${qualification_form_0_open_btn_locator}
     open popup by btn locator                                   ${qualification_form_0_open_btn_locator}
-    Wait Until Page Contains                                    ${popup_opened_content_success_locator}  60
-    run keyword and ignore error                                wait until element is visible  ${tender_status_active_qualification_value_locator}  10
-    wait until element is visible                               ${qualification_form_submit_btn_locator}  60
 #    ${file_path}  ${file_name}  ${file_content} =               create_fake_doc
     Execute Javascript  $('#qualificationform-decision').val('accept').change()
     capture page screenshot
-    run keyword and ignore error                                wait until page contains element  ${award_form_qualified_input_locator}
+#    run keyword and ignore error                                wait until page contains element  ${award_form_qualified_input_locator}
     capture page screenshot
     run keyword and ignore error                                click visible element  ${award_form_qualified_input_locator}
     choose file                                                 ${add_file_to_qualification_form_locator}  ${document}
-    wait until page does not contain element                    ${popup_dynamic_form_loading_element_locator}  60
+#    wait until page does not contain element                    ${popup_dynamic_form_loading_element_locator}  60
     wait until element is visible                               ${qualification_form_add_document_type_input_locator}  60
 #    submit current visible popup
@@ -259,20 +256,20 @@ confirm award
     click visible element                                       ${qualification_form_add_document_close_description_btn_locator}
     capture page screenshot
-    run keyword and ignore error                                click visible element  ${qualification_ecp_check_input_locator}
+#    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}
     capture page screenshot
-    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}
+#    run keyword and ignore error                                run keyword if  '${mode}' in 'reporting'   wait until page contains element with reloading  ${qualification_form_0_open_btn_locator}
     capture page screenshot
-    run keyword and ignore error                                run keyword if  '${mode}' in 'reporting'   wait until page contains element with reloading  ${qualification_form_0_open_btn_locator}
+#    run keyword and ignore error                                run keyword if  '${mode}' in 'reporting'   open popup by btn locator  ${qualification_form_0_open_btn_locator}
     capture page screenshot
-    run keyword and ignore error                                run keyword if  '${mode}' in 'reporting'   open popup by btn locator  ${qualification_form_0_open_btn_locator}
-    capture page screenshot
-    run keyword and ignore error                                run keyword if  '${mode}' in 'reporting'   Execute Javascript  $('#qualificationform-decision').val('accept').change()
+#    run keyword and ignore error                                run keyword if  '${mode}' in 'reporting'   Execute Javascript  $('#qualificationform-decision').val('accept').change()
     capture page screenshot
     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}
     capture page screenshot
+    run keyword and ignore error                                click visible element  ${qualification_ecp_check_input_locator}
+    capture page screenshot
     wait until element is visible                               ${qualification_form_submit_btn_locator}  60
-##    run keyword and ignore error                                submit form and check result  ${qualification_form_submit_btn_locator}  ${None}  ${qualification_ecp_form_open_locator}
+#    run keyword and ignore error                                submit form and check result  ${qualification_form_submit_btn_locator}  ${None}  ${qualification_ecp_form_open_locator}
     Execute Javascript  $('.fancybox-is-open .fancybox-content button.btn.btn-success').click()
 #    click visible element                                       ${qualification_form_submit_btn_locator}
     capture page screenshot
--- a/playtender_qualification_variables.robot
View file @6c9eb46
+++ b/playtender_qualification_variables.robot
View file @6c9eb46
@@ -55,7 +55,8 @@ ${qualification_form_cancel_input_locator} =                        $('#qualific
 ${qualification_form_add_document_type_input_locator} =             jquery=.js-dynamic-form-content-item:last .document-type select[id*="-document_type"]
 ${qualification_form_add_document_description_btn_locator} =        jquery=.js-dynamic-form-content-item:last [href$="#edit"]:last
 ${qualification_form_add_document_description_input_locator} =      jquery=.js-dynamic-form-content-item:last .popover.fade.top.in textarea[id*="-description"].form-control
-${qualification_form_add_document_close_description_btn_locator} =  jquery=.js-dynamic-form-content-item:last .popover.fade.top.in [href$="#close"]
+${qualification_form_add_document_close_description_btn_locator} =  jquery=#qualification-documents .js-actions-wrapper:last .popover.fade.top.in [href$="#close"]
+#${qualification_form_add_document_close_description_btn_locator} =  jquery=.js-dynamic-form-content-item:last .popover.fade.top.in [href$="#close"]
 #award reporting and negotiotion
 ${award_form_qualified_input_locator} =                             jquery=#qualificationform-qualified
--- a/playtender_variables.robot
View file @6c9eb46
+++ b/playtender_variables.robot
View file @6c9eb46
@@ -307,9 +307,9 @@ ${tender_form_general_panel_edit_btn_locator} =                     jquery=#Gene
 ${tender_form_general_panel_draft_mode_input_locator} =             jquery=[id*="-draft_mode"]
 ${tender_form_general_panel_document_stage2_input_locator} =        jquery=#collapseGeneral .actions-wrapper .js-btn-add-form-popup-panel[data-attribute="documents"]
 ${stage2_form_add_document_type_input_locator} =                    jquery=.js-dynamic-form-content-item:last .document-type select[id*="-document_type"]
-${stage2_form_add_document_description_btn_locator} =        jquery=.js-dynamic-form-content-item:last [href$="#edit"]:last
-${stage2_form_add_document_description_input_locator} =      jquery=.js-dynamic-form-content-item:last .popover.fade.top.in textarea[id*="-description"].form-control
-${stage2_form_add_document_close_description_btn_locator} =  jquery=.js-dynamic-form-content-item:last .popover.fade.top.in [href$="#close"]
+${stage2_form_add_document_description_btn_locator} =               jquery=.js-dynamic-form-content-item:last [href$="#edit"]:last
+${stage2_form_add_document_description_input_locator} =             jquery=.js-dynamic-form-content-item:last .popover.fade.top.in textarea[id*="-description"].form-control
+${stage2_form_add_document_close_description_btn_locator} =         jquery=.js-dynamic-form-content-item:last .popover.fade.top.in [href$="#close"]