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

Oleksandr Iskryzhytskyi
2 parents 63b5a7b2 391d6ef1
Showing 5 changed files with 50 additions and 20 deletions
playtender.robot
playtender_claim.robot
playtender_qualification.robot
playtender_qualification_variables.robot
playtender_tender.robot
--- a/playtender.robot
View file @eb89f2a
+++ b/playtender.robot
View file @eb89f2a
@@ -149,10 +149,10 @@ Resource                                                        playtender_contr
     [Documentation]                                             Отримати значення поля field_name для тендера tender_uaid.
     # fix for preventing error "Resolving variable '${award.value.amount}' failed: AttributeError: value" in next keywords for owner role
-    run keyword if                                              ${is_test_role_owner} and '${field_name}' == 'awards[0].complaintPeriod.endDate'  fix awards data in global Users variable  ${username}
+    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}
     open tender page by uaid                                    ${tender_uaid}
-    wait until page does not contain element with reloading     ${tender_sync_element_locator}
+#    wait until page does not contain element with reloading     ${tender_sync_element_locator}
     run keyword if                                              '${field_name}' == 'status'  wait for tender status
     run keyword if                                              '${field_name}' == 'agreements[0].status'  Wait Until Keyword Succeeds    1600 s    20 s    wait for agreements status active
     run keyword if                                              '${field_name}' == 'qualificationPeriod.endDate'  Wait Until Keyword Succeeds    1600 s    20 s    Wait For QualificationsPeriodEnd
@@ -685,7 +685,7 @@ Resource                                                        playtender_contr
     open tender page by uaid                                    ${tender_uaid}
     open tender form qualification                              ${award_num}
-    confirm award qualification                                 ${username}  ${award_num}
+    run keyword if                                              ${award_num} != 3  confirm award qualification                                 ${username}  ${award_num}
 Дискваліфікувати постачальника
     [Arguments]                                                 ${username}  ${tender_uaid}  ${award_num}
@@ -706,6 +706,14 @@ Resource                                                        playtender_contr
 #    wait until popup is visible
     cancel award qualification
+Затвердити постачальників
+    [Arguments]                                                 ${username}  ${tender_uaid}
+    [Documentation]                                             Перевести постачальників для тендера tender_uaid
+    ...                                                         в статус active.
+
+    open tender page by uaid                                    ${tender_uaid}
+    confirm awards
+
 ########################################################################################################################
 ################################################### END QUALIFICATION KEYWORDS ########################################
 ########################################################################################################################
@@ -721,7 +729,7 @@ Resource                                                        playtender_contr
     open tender form by uaid                                    ${tender_uaid}
     fill tender from award reporting                            ${supplier_data.data.value.amount}  ${supplier_data.data.suppliers[0]}
     run keyword and ignore error                                save tender form and wait synchronization
-    confirm award
+    confirm award                                               ${document}
 ########################################################################################################################
 ################################################### END LIMITED PROCUREMENT KEYWORDS ##################################
 ########################################################################################################################
--- a/playtender_claim.robot
View file @eb89f2a
+++ b/playtender_claim.robot
View file @eb89f2a
@@ -165,7 +165,7 @@ get document complaint
     click visible element                                       ${claim_page_open_btn_locator}
     click visible element and wait until page contains element  ${claim_page_open_btn_locator}  ${claim_form_open_btn_locator}
     ${claim_form_resolved_input_locator} =                      replace string  ${claim_form_resolved_input_locator_tpl}  %complaint_id%  ${complaintID}
-    click visible element                                       ${claim_form_resolved_input_locator}
+    open popup by btn locator                                   ${claim_form_resolved_input_locator}
     Wait Until Page Contains                                    ${popup_opened_content_success_locator}  60
     wait until element is visible                               ${claim_form_complaintform_submit_btn_locator}  60
 ##    wait until element is visible                               ${popup_opened_content_locator}  60
@@ -186,13 +186,10 @@ get document complaint
     wait until page contains element with reloading             ${claim_open_form_answer_locator}
     ${claim_form_open_form_answer_btn_locator} =                replace string  ${claim_form_open_form_answer_btn_locator_tpl}  %title%  ${complaintID}
     wait until page contains element with reloading             ${claim_form_open_form_answer_btn_locator}
-    submit form and check result                                ${claim_form_open_form_answer_btn_locator}  ${None}  ${popup_opened_content_locator}
+    open popup by btn locator                                   ${claim_form_open_form_answer_btn_locator}
     Wait Until Page Contains                                    ${popup_opened_content_success_locator}  60
     wait until element is visible                               ${claim_form_answer_resolution_value_locator}  60
-##    wait until element is visible                               ${popup_opened_content_locator}  60
-#    click visible element                                       ${claim_form_open_form_answer_btn_locator}
-#    wait until popup is visible
     input text to exist visible input                           ${claim_form_answer_resolution_value_locator}  ${answer_data.data.resolution}
     Run Keyword If                                              '${answer_data.data.resolutionType}' == 'resolved'  select from list by value  ${claim_form_answer_resolution_type_value_locator}  resolved
     Run Keyword If                                              '${answer_data.data.resolutionType}' == 'declined'  select from list by value  ${claim_form_answer_resolution_type_value_locator}  declined
--- a/playtender_qualification.robot
View file @eb89f2a
+++ b/playtender_qualification.robot
View file @eb89f2a
@@ -94,11 +94,19 @@ open tender form qualification
     [Arguments]                                                 ${award_num}
     [Documentation]                                             Відкрити форму кваліфікації і потрібну кваліфікацію під номером award_num
-    run keyword if                                              ${award_num} == 0   wait until page contains element with reloading  ${qualification_form_0_open_btn_locator}
-    run keyword if                                              ${award_num} == 0  click visible element  ${qualification_form_0_open_btn_locator}
+    run keyword if                                              "${mode}" not in "open_framework"  Run Keywords
+    ...                                                         run keyword if  ${award_num} == 0  wait until page contains element with reloading  ${qualification_form_0_open_btn_locator}
+    ...  AND                                                    run keyword if  ${award_num} == 0  click visible element  ${qualification_form_0_open_btn_locator}
 ##### BOF - TMP #####
-    run keyword if                                              ${award_num} == 1 or ${award_num} == -1  click visible element  ${qualification_form_0_open_btn_locator}
-    run keyword if                                              ${award_num} == 2  click visible element  ${qualification_form_0_open_btn_locator}
+    ...  AND                                                    run keyword if  ${award_num} == 1 or ${award_num} == -1  click visible element  ${qualification_form_0_open_btn_locator}
+    ...  AND                                                    run keyword if  ${award_num} == 2  click visible element  ${qualification_form_0_open_btn_locator}
+    ...  ELSE IF                                                "${mode}" in "open_framework"  Run Keywords
+    ...                                                         run keyword if  ${award_num} == 0  wait until page contains element with reloading  ${qualification_form_0_open_btn_locator}
+    ...  AND                                                    run keyword if  ${award_num} == 0  click visible element  ${qualification_form_0_open_btn_locator}
+##### BOF - TMP #####
+    ...  AND                                                    run keyword if  ${award_num} == 1 or ${award_num} == -1  click visible element  ${qualification_form_1_open_btn_locator}
+    ...  AND                                                    run keyword if  ${award_num} == 2  click visible element  ${qualification_form_2_open_btn_locator}
+#    ...  AND                                                    run keyword if  ${award_num} == 3  click visible element  ${qualification_form_3_open_btn_locator}
 ##### EOF - TMP #####
 #    run keyword if                                              ${award_num} == 1 or ${award_num} == -1  click visible element  ${qualification_form_1_open_btn_locator}
@@ -235,6 +243,7 @@ cancel award qualification
 #qualification awawd reporting and negotiotion
 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
@@ -242,19 +251,18 @@ confirm award
     run keyword and ignore error                                run keyword if  '${mode}' in 'negotiation reporting'  close current visible alert
     capture page screenshot
-    capture page screenshot
     wait until page contains element with reloading             ${qualification_form_0_open_btn_locator}
     click visible element                                       ${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
+#    ${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}
     capture page screenshot
     run keyword and ignore error                                click visible element  ${award_form_qualified_input_locator}
-    choose file                                                 ${add_file_to_qualification_form_locator}  ${file_path}
+    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 element is visible                               ${qualification_form_add_document_type_input_locator}  60
 #    submit current visible popup
@@ -298,4 +306,16 @@ confirm award
     run keyword and ignore error                                submit form and check result  ${qualification_form_submit_btn_locator}  ${qualification_award_after_ecp_form_submit_success_msg}  ${None}
     capture page screenshot
+confirm awards
+    [Documentation]                                             Перевести постачальників для тендера tender_uaid
+    ...                                                         в статус active.
+
+    click visible element                                       ${qualification_agreement_form_approve_submit_btn_locator}
+    wait until page contains                                    ${qualification_form_approve_question_msg}
+    Execute Javascript  ${qualification_form_approve_js_submit_btn_locator}
+    Wait Until Page Contains                                    ${qualification_agreement_form_approve_success_msg}  60
+    wait until alert is visible                                 ${qualification_agreement_form_approve_success_msg}
+    run keyword and ignore error                                run keyword if condition is not none  ${qualification_agreement_form_approve_success_msg}  close current visible alert
+    Wait Until Keyword Succeeds                                 800 s    20 s    Wait For QualificationsPeriodEnd
+
--- a/playtender_qualification_variables.robot
View file @eb89f2a
+++ b/playtender_qualification_variables.robot
View file @eb89f2a
@@ -3,7 +3,8 @@
 #qualification
 ${prequalification_form_0_open_btn_locator} =                       jquery=#bids-pjax .pseudo-table__row:nth(1) a[href*="/tender/prequalification"]
 ${prequalification_form_1_open_btn_locator} =                       jquery=#bids-pjax .pseudo-table__row:nth(2) a[href*="/tender/prequalification"]
-${prequalification_form_2_open_btn_locator} =                       jquery=#bids-pjax .pseudo-table__row:last a[href*="/tender/prequalification"]
+${prequalification_form_2_open_btn_locator} =                       jquery=#bids-pjax .pseudo-table__row:nth(3) a[href*="/tender/prequalification"]
+${prequalification_form_3_open_btn_locator} =                       jquery=#bids-pjax .pseudo-table__row:nth(4) a[href*="/tender/prequalification"]
 ${prequalification_form_approve_open_btn_locator} =                 jquery=.aside__inner a[href*="/tender/prequalification-approve"]
 ${prequalification_form_accept_input_locator} =                     $('#prequalificationform-decision').val('accept').change()
 ${prequalification_form_decline_input_locator} =                    $('#prequalificationform-decision').val('decline').change()
@@ -23,9 +24,13 @@ ${qualification_form_submit_btn_locator} =                          jquery=.fanc
 ${qualification_form_approve_submit_btn_locator} =                  jquery=.jconfirm-box-container .btn.btn-default
 ${qualification_form_approve_success_msg} =                         Прекваліфікація підтверджена, дочекайтесь опублікування на сайті уповноваженого органу.
 ${qualification_form_approve_js_submit_btn_locator} =                $('.jconfirm-box-container .btn.btn-default').click()
+${qualification_agreement_form_approve_submit_btn_locator} =        jquery=.aside__inner a.js-qualification-approve
+${qualification_agreement_form_approve_success_msg} =               Кваліфікація підтверджена, дочекайтесь опублікування на сайті уповноваженого органу.
-${qualification_form_0_open_btn_locator} =                          jquery=#bids-pjax .pseudo-table__row a[href*="/tender/qualification"]
-${qualification_form_1_open_btn_locator} =                          jquery=#bids-pjax .pseudo-table__row:last a[href*="/tender/qualification"]
+${qualification_form_0_open_btn_locator} =                          jquery=#bids-pjax .pseudo-table__row:nth(1) a[href*="/tender/qualification"]
+${qualification_form_1_open_btn_locator} =                          jquery=#bids-pjax .pseudo-table__row:nth(2) a[href*="/tender/qualification"]
+${qualification_form_2_open_btn_locator} =                          jquery=#bids-pjax .pseudo-table__row:nth(3) a[href*="/tender/qualification"]
+${qualification_form_3_open_btn_locator} =                          jquery=#bids-pjax .pseudo-table__row:nth(4) a[href*="/tender/qualification"]
 ${qualification_form_eligible_input_locator} =                      jquery=#qualificationform-eligible
 ${qualification_form_qualified_input_locator} =                     jquery=#qualificationform-qualified
 ${qualification_award_form_submit_success_msg} =                    Рішення завантажене, тепер потрібно накласти ЕЦП/КЕП.
--- a/playtender_tender.robot
View file @eb89f2a
+++ b/playtender_tender.robot
View file @eb89f2a
@@ -424,7 +424,7 @@ activate stage 2
     [Documentation]                                             Перевести тендер tender_uaid в статус active.tendering.
     open popup by btn locator                                   ${tender_form_general_panel_edit_btn_locator}
-    ${tender_end_date} =                                        Get Current Date  increment=00:25:00  result_format=%Y-%m-%dT%H:%M:%S.%f%z+02:00
+    ${tender_end_date} =                                        Get Current Date  increment=00:35:00  result_format=%Y-%m-%dT%H:%M:%S.%f%z+02:00
 #    ${tender_end_date} =                                        Get Current Date  increment=00:25:00  result_format=%d.%m.%Y %H:%M
     input datetime to visible input                             ${tender_tender_period_end_date_input_locator}  ${tender_end_date}
     capture page screenshot