common

- optimized: "get is element exist" keyword with JS help - added: "generate_dictionary_from_field_path_and_value" keyword plans - added: updating plan by field key and value

common
- optimized: "get is element exist" keyword with JS help - added: "generate_dictionary_from_field_path_and_value" keyword plans - added: updating plan by field key and value
Oleksandr Iskryzhytskyi
1 parent fa5393b2
Showing 6 changed files with 103 additions and 13 deletions
.gitignore
playtender.robot
playtender_common.robot
playtender_plan.robot
playtender_service.py
playtender_variables.robot
--- a/.gitignore
View file @001ae27
+++ b/.gitignore
View file @001ae27
@@ -9,4 +9,6 @@ __pycache__/
 /*.egg-info/
 *.egg
-/.idea
+/.idea
+test.robot
+/test_output
--- a/playtender.robot
View file @001ae27
+++ b/playtender.robot
View file @001ae27
@@ -38,6 +38,10 @@ Resource                                                        playtender_plan.
     [Arguments]                                                 ${user}  ${plan_data}
     [Documentation]                                             Створити план з початковими даними plan_data. Повернути uaid створеного плану.
+    # check buyers
+    ${buyers_count} =                                           get length  ${plan_data['data']['buyers']}
+    run keyword if                                              ${buyers_count} != 1  fail  Buyer must be one
+
     open new plan form
     fill plan form                                              ${plan_data['data']}
     submit form and check result                                ${plan_form_submit_btn_locator}  ${plan_form_submit_success_msg}  ${plan_created_checker_element_locator}
@@ -52,8 +56,18 @@ Resource                                                        playtender_plan.
     open plan page by uaid                                      ${plan_uaid}
 Пошук плану по ідентифікатору
-    [Arguments]                                                 ${username}  ${uaid}
-    [Documentation]                                             Знайти план за вказаним uaid.
+    [Arguments]                                                 ${username}  ${plan_uaid}
+    [Documentation]                                             Знайти план за зазначеним plan_uaid.
     open plan search form
-    input to search form and wait results                       ${plan_search_form_query_input_locator}  ${uaid}  ${plan_search_form_result_locator_tpl}
+    input to search form and wait results                       ${plan_search_form_query_input_locator}  ${plan_uaid}  ${plan_search_form_result_locator_tpl}
+
+Внести зміни в план
+    [Arguments]                                                 ${username}  ${plan_uaid}  ${fieldname}  ${fieldvalue}
+    [Documentation]                                             Змінити значення поля fieldname на fieldvalue для плана із зазначеним plan_uaid.
+
+    ${plan_data} =                                              generate dictionary from field path and value  ${fieldname}  ${fieldvalue}
+    open plan form by uaid                                      ${plan_uaid}
+    fill plan form                                              ${plan_data}
+    submit form and check result                                ${plan_form_submit_btn_locator}  ${plan_form_submit_success_msg}  ${plan_created_checker_element_locator}
+    wait until page does not contain element with reloading     ${plan_sync_element_locator}
--- a/playtender_common.robot
View file @001ae27
+++ b/playtender_common.robot
View file @001ae27
@@ -79,6 +79,13 @@ click visible element
     __private__set_element_visible_in_browser_area              ${locator}
     click element                                               ${locator}
+click visible element and wait until page contains element
+    [Arguments]                                                 ${locator}  ${checker_element_locator}  ${waiting_timeout}=30s  ${waiting_error}=Another element was not shown after clicking on specific element
+    [Documentation]                                             перевіряє видимість і клікає по елементу
+
+    click visible element                                       ${locator}
+    wait until page contains element                            ${checker_element_locator}  ${waiting_timeout}  ${waiting_error}
+
 input text to visible input
     [Arguments]                                                 ${locator}  ${text}
     [Documentation]                                             перевіряє чи елемент видимий у вікні браузера, після чого заповнює його
@@ -202,6 +209,8 @@ submit current visible popup
     click visible element                                       ${popup_opened_last_submit_btn_locator}
     sleep                                                       ${popup_transaction_time}
     ${popup_last_locator} =                                     set variable  id=${popup_last_id}
+    ${popup_exists} =                                           __private__get_is_element_exist  ${popup_last_locator}
+    return from keyword if                                      ${popup_exists} == ${False}
     wait until page does not contain element                    ${popup_last_locator}  30s  Current popup was not hidden
 submit form and check result
@@ -289,7 +298,8 @@ __private__get_is_element_exist
     [Arguments]                                                 ${locator}
     [Documentation]                                             повертає чи елемент присутній на сторінці
-    ${result} =                                                 run keyword and return status  page should contain element  ${locator}
+    ${result} =                                                 get is element exist  ${locator}
+#    ${result} =                                                 run keyword and return status  page should contain element  ${locator}
     [Return]                                                    ${result}
 __private__get_element_attribute
--- a/playtender_plan.robot
View file @001ae27
+++ b/playtender_plan.robot
View file @001ae27
@@ -9,6 +9,13 @@ open new plan form
     open page and wait element by locator                       ${broker_baseurl}/plan/create  ${plan_form_locator}
+open plan form by uaid
+    [Arguments]                                                 ${plan_uaid}
+    [Documentation]                                             відкриття сторінки редагування плану
+
+    open plan page by uaid                                      ${plan_uaid}
+    click visible element and wait until page contains element  ${plan_edit_btn_locator}  ${plan_form_locator}
+
 open plan page by uaid
     [Arguments]                                                 ${uaid}
     [Documentation]                                             відкриває сторінку з планом
@@ -24,10 +31,6 @@ fill plan form
     [Arguments]                                                 ${data}
     [Documentation]                                             заповнення форми з масива даних
-    # check buyers
-    ${buyers_count} =                                           get length  ${data['buyers']}
-    run keyword if                                              ${buyers_count} != 1  fail  Buyer must be one
-
     # hidden inputs
     ${budget_id} =                                              get from dictionary by keys  ${data}  budget  id
     run keyword if condition is not none                        ${budget_id}  input text to hidden input  ${plan_form_budget_id_input_locator}  ${budget_id}
@@ -65,7 +68,11 @@ fill plan form items
     [Documentation]                                             заповнення номенклатури плану
     :FOR  ${item_attributes}  IN  @{item_attributes_array}
-    \  click visible element                                    ${plan_form_add_item_btn_locator}
+    \  ${item_update_index} =                                   get from dictionary by keys  ${item_attributes}  list_index
+    \  ${item_update_index_string} =                            convert to string  ${item_update_index}
+    \  ${open_form_btn_locator} =                               replace string  ${plan_form_update_item_btn_locator_tpl}  %index%  ${item_update_index_string}
+    \  run keyword if condition is not none                     ${item_update_index}  click visible element  ${open_form_btn_locator}
+    \  run keyword if condition is none                         ${item_update_index}  click visible element  ${plan_form_add_item_btn_locator}
     \  wait until popup is visible
     \  fill item form in opened popup                           ${item_attributes}
     \  submit current visible popup
--- a/playtender_service.py
View file @001ae27
+++ b/playtender_service.py
View file @001ae27
 # -*- coding: utf-8 -
 from robot.libraries.BuiltIn import BuiltIn
 from iso8601 import parse_date
+import re
 def get_library():
@@ -18,12 +19,18 @@ def get_variable_is_none(variable):
     return False
-# check if condition is not none type and run specified keyword
+# run specified keyword if condition is not none type
 def run_keyword_if_condition_is_not_none(condition, name, *args):
     if get_variable_is_none(condition) == False:
         BuiltIn().run_keyword(name, *args)
+# run specified keyword if condition is none type
+def run_keyword_if_condition_is_none(condition, name, *args):
+    if get_variable_is_none(condition) == True:
+        BuiltIn().run_keyword(name, *args)
+
+
 # return value for *keys (nested) in `element` (dict).
 def get_from_dictionary_by_keys(element, *keys):
     if not isinstance(element, dict):
@@ -40,6 +47,33 @@ def get_from_dictionary_by_keys(element, *keys):
     return _element
+# returns if element exists on page. optimization
+def get_is_element_exist(locator):
+    jquery_locator = convert_locator_to_jquery(locator)
+    if get_variable_is_none(jquery_locator) == False:
+        jquery_locator = jquery_locator.replace('"', '\\"')
+        length = get_webdriver_instance().execute_script('return $("' + jquery_locator + '").length;')
+        return length > 0
+
+    try:
+        get_library()._element_find(locator, None, True)
+    except Exception:
+        return False
+    return True
+
+
+# convert locator to jquery locator
+def convert_locator_to_jquery(locator):
+    locator_params = locator.split('=', 1)
+    if locator_params[0] == 'id':
+        return '#' + locator_params[1]
+    if locator_params[0] == 'jquery':
+        return locator_params[1]
+    if locator_params[0] == 'css':
+        return locator_params[1]
+    return None
+
+
 # set scroll to element in view
 def set_element_scroll_into_view(locator):
     element = get_library()._element_find(locator, None, True)
@@ -141,3 +175,24 @@ def prepare_buyers_data(data):
     item.identifier['id'] = u"playtender"
     item.identifier['legalName'] = u"Playtender"
     item.identifier['scheme'] = u"UA-EDR"
+
+
+# prepare dictionary from field path + value
+def generate_dictionary_from_field_path_and_value(path, value):
+    data = dict()
+    path_keys_list = path.split('.')
+    if len(path_keys_list) > 1:
+        key = path_keys_list.pop(0)
+        value = generate_dictionary_from_field_path_and_value('.'.join(path_keys_list), value)
+        indexRegex = re.compile(r'(\[(\d+)\]$)')
+        matchObj = indexRegex.search(key)
+        print matchObj
+        if matchObj:
+            key = indexRegex.sub('', key)
+            value['list_index'] = matchObj.group(2)
+            value = [value]
+        data[key] = value
+    else:
+        data = dict()
+        data[path] = value
+    return data
--- a/playtender_variables.robot
View file @001ae27
+++ b/playtender_variables.robot
View file @001ae27
@@ -22,7 +22,7 @@ ${language_selector_list_element_locator_tpl} =                     jquery=.lang
 ${classification_popup_opened_content_locator} =                    jquery=.fancybox-is-open .fancybox-slide--current .fancybox-content.classification-modal  # for checking if it's visible
 ${classification_popup_scheme_tab_locator_tpl} =                    jquery=.fancybox-is-open .fancybox-slide--current .fancybox-content.classification-modal .nav a[data-toggle="tab"][data-scheme="%scheme%"]
 ${classification_popup_search_input_locator} =                      jquery=.fancybox-is-open .fancybox-slide--current .fancybox-content.classification-modal .js-search-wrapper:visible .js-input
-${classification_popup_serach_item_locator_tpl} =                   jquery=.fancybox-is-open .fancybox-slide--current .fancybox-content.classification-modal .js-search-wrapper:visible .js-search-tree strong:contains("%code%")
+${classification_popup_serach_item_locator_tpl} =                   jquery=.fancybox-is-open .fancybox-slide--current .fancybox-content.classification-modal .js-search-wrapper:visible .js-search-tree strong:contains(%code%)
 # authorization
 ${login_popup_open_locator} =                                       jquery=.page__header a[data-action="login"]
@@ -57,6 +57,7 @@ ${plan_form_classification_edit_btn_locator} =                      jquery=.fiel
 ${plan_form_additional_classification_edit_btn_locator} =           jquery=.field-planform-additional_classification_ids .js-additional-classification-input-wrapper [data-toggle="additional-classification"]
 ${plan_form_kekv_classification_edit_btn_locator} =                 jquery=.field-planform-additional_classification_ids_kekv .js-additional-classification-input-wrapper [data-toggle="additional_classification_ids_kekv"]
 ${plan_form_add_item_btn_locator} =                                 jquery=#Items .js-form-popup-add
+${plan_form_update_item_btn_locator_tpl} =                          jquery=#Items .js-form-popup-panel:nth(%index%) .panel-heading .js-form-popup-update
 ${plan_form_submit_btn_locator} =                                   jquery=#plan-form .js-submit-btn
 ${plan_created_checker_element_locator} =                           id=plan-part-pjax
@@ -64,8 +65,9 @@ ${plan_created_checker_element_locator} =                           id=plan-part
 ${plan_view_checker_element_locator} =                              id=plan-general-info
 ${plan_sync_element_locator} =                                      jquery=#aside-part-pjax .status-label .fa-refresh
 ${plan_uaid_text_locator} =                                         jquery=#plan-general-info .plan-id .value
+${plan_edit_btn_locator} =                                          jquery=#aside-part-pjax a[href*='plan/update']
 # plan index + search
 ${plan_search_form_locator} =                                       id=plan-filter-form
 ${plan_search_form_query_input_locator} =                           jquery=#plan-filter-form .dynamic-search-query input
-${plan_search_form_result_locator_tpl} =                            jquery=#plan-list .lots__item .lot__characteristic li:contains("%query%")
+${plan_search_form_result_locator_tpl} =                            jquery=#plan-list .lots__item .lot__characteristic li:contains(%query%)