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

@@ -289,7 +289,9 @@ open popup by btn locator
     [Documentation]                                             натискає кнопку відкриття попапу і чекає поки він відмалюється
     [Documentation]                                             натискає кнопку відкриття попапу і чекає поки він відмалюється
 
 
     click visible element                                       ${btn_locator}
     click visible element                                       ${btn_locator}
-    wait until popup is visible                                 ${popup_locator}
+    ${result} =                                                 run keyword and return status  wait until popup is visible  ${popup_locator}
+    run keyword if                                              ${result} == ${False}  js click element  ${btn_locator}
+    run keyword if                                              ${result} == ${False}  wait until popup is visible  ${popup_locator}
 
 
 submit current visible popup
 submit current visible popup
     [Documentation]                                             натискає кнопку сабміту в поточному попапі і чекає поки він закриється
     [Documentation]                                             натискає кнопку сабміту в поточному попапі і чекає поки він закриється
@@ -335,6 +337,9 @@ wait until alert is visible
     run keyword if                                              ${message_is_none} == ${True}  wait until page contains element  ${alert_opened_locator}  60s  Alert was not shown
     run keyword if                                              ${message_is_none} == ${True}  wait until page contains element  ${alert_opened_locator}  60s  Alert was not shown
     run keyword if                                              ${message_is_none} == ${False}  wait until page contains element  ${alert_message_locator}  60s  Alert was not shown
     run keyword if                                              ${message_is_none} == ${False}  wait until page contains element  ${alert_message_locator}  60s  Alert was not shown
 
 
+    # wait for ending animation
+    sleep                                                       500ms
+
 close current visible alert
 close current visible alert
     [Documentation]                                             закриває поточний alert
     [Documentation]                                             закриває поточний alert
 
 

@@ -39,13 +39,9 @@ answer question
     wait until page contains element with reloading             ${question_open_form_answer_locator}
     wait until page contains element with reloading             ${question_open_form_answer_locator}
     ${question_form_open_form_answer_btn_locator} =             replace string  ${question_form_open_form_answer_btn_locator_tpl}  %title%  ${question_id}
     ${question_form_open_form_answer_btn_locator} =             replace string  ${question_form_open_form_answer_btn_locator_tpl}  %title%  ${question_id}
     wait until page contains element with reloading             ${question_form_open_form_answer_btn_locator}
     wait until page contains element with reloading             ${question_form_open_form_answer_btn_locator}
-    ${question_open_form_answer_js_btn_locator} =               replace string  ${question_open_form_answer_js_btn_locator_tpl}  %title%  ${question_id}
-#    open popup by btn locator                                   ${question_form_open_form_answer_btn_locator}
-#    sleep  300
-#    Execute Javascript  ${question_open_form_answer_js_btn_locator}
-    execute javascript                                          ${question_open_form_answer_js_btn_locator}
-    input text to exist visible input                           ${question_form_open_form_answer_input_locator}  ${answer_data.data.answer}
-    submit form and check result                                ${question_form_answer_submit_btn_locator}  ${question_form_submit_answer_success_msg}  ${tender_created_checker_element_locator}
+    open popup by btn locator                                   ${question_form_open_form_answer_btn_locator}
+    input text to exist visible input                           ${question_answer_form_answer_input_locator}  ${answer_data.data.answer}
+    submit form and check result                                ${question_answer_form_submit_btn_locator}  ${question_form_submit_answer_success_msg}
 
 
 get question information
 get question information
     [Arguments]                                                 ${question_id}  ${field_name}
     [Arguments]                                                 ${question_id}  ${field_name}

@@ -20,6 +20,9 @@ ${question_form_create_questionform_related_lot_input_locator} =    jquery=.fanc
 ${question_form_create_questionform_related_lot_input_locator_tpl} =  jquery=.fancybox-is-open .fancybox-content #questionform-related_lot option:contains("%type_id%")
 ${question_form_create_questionform_related_lot_input_locator_tpl} =  jquery=.fancybox-is-open .fancybox-content #questionform-related_lot option:contains("%type_id%")
 ${question_form_open_create_btn_locator} =                           jquery=#tender-part-pjax a[href*="/tender/question-create"]:first
 ${question_form_open_create_btn_locator} =                           jquery=#tender-part-pjax a[href*="/tender/question-create"]:first
 
 
+${question_answer_form_answer_input_locator} =                      jquery=#questionanswerform-answer
+${question_answer_form_submit_btn_locator} =                        jquery=#tender-question-answer-form .js-submit-btn
+
 #for viewer
 #for viewer
 ${question_answer_value_locator_tpl} =                              jquery=#tender-question-list .js-item div[data-title*="%title%"] .info-row.answer span.value
 ${question_answer_value_locator_tpl} =                              jquery=#tender-question-list .js-item div[data-title*="%title%"] .info-row.answer span.value
 ${question_title_value_locator_tpl} =                               jquery=#tender-question-list .js-item div[data-title*="%title%"] h4.callout__title
 ${question_title_value_locator_tpl} =                               jquery=#tender-question-list .js-item div[data-title*="%title%"] h4.callout__title

@@ -70,6 +70,15 @@ def get_is_element_exist(locator):
     return True
     return True
 
 
 
 
+# click
+def js_click_element(locator):
+    element = get_library()._element_find(locator, None, True)
+    get_webdriver_instance().execute_script(
+        'var $el = jQuery(arguments[0]); if($el.length) $el.click();',
+        element
+    )
+
+
 # convert locator to jquery locator
 # convert locator to jquery locator
 def convert_locator_to_jquery(locator):
 def convert_locator_to_jquery(locator):
     locator_params = locator.split('=', 1)
     locator_params = locator.split('=', 1)

@@ -15,7 +15,7 @@ open new tender form
     open page and wait element by locator                       ${broker_baseurl}/tender/create  ${tender_form_locator}
     open page and wait element by locator                       ${broker_baseurl}/tender/create  ${tender_form_locator}
 
 
 update tender queue
 update tender queue
-    [Documentation]                                             запускає оновлення планів з ЦБД і додає їх в чергу, тобто синхронізація може відбутися не відразу
+    [Documentation]                                             запускає оновлення тендерів з ЦБД і додає їх в чергу, тобто синхронізація може відбутися не відразу
     ...                                                         поточна сторіка повертається
     ...                                                         поточна сторіка повертається
 
 
     ${current_url} =                                            get location
     ${current_url} =                                            get location