Commit 24cd8d81860ab734087e18401f61e89dad5b2ff6

Authored by Playtenders
1 parent 5749229a

fix esco tender_owner contact_point_name_en + organization_name_en

... ... @@ -326,8 +326,8 @@ submit form and check result
326 326 run keyword and ignore error execute javascript ${tender_cpv_js_submit_btn_locator}
327 327 Capture Page Screenshot
328 328 run keyword and ignore error run keyword if '${mode}' in 'reporting' close sync alert ${tender_form_submit_reporting_success_msg}
329   - run keyword if condition is not none ${wait_msg} Wait Until Page Contains ${wait_msg} 60
330   - run keyword if condition is not none ${wait_msg} wait until alert is visible ${wait_msg}
  329 + run keyword and ignore error run keyword if condition is not none ${wait_msg} Wait Until Page Contains ${wait_msg} 60
  330 + run keyword and ignore error run keyword if condition is not none ${wait_msg} wait until alert is visible ${wait_msg}
331 331 run keyword and ignore error run keyword if condition is not none ${wait_msg} close current visible alert
332 332
333 333 #cat проба
... ...
... ... @@ -60,6 +60,7 @@ fill tender form
60 60 ${supplier_data} = op_robot_tests.tests_files.service_keywords . Test Supplier Data
61 61 run keyword if '${mode}' in 'negotiation reporting' fill tender from award reporting ${data.value.amount} ${supplier_data.data.suppliers[0]}
62 62 Run Keyword And Ignore Error fill tender required documents
  63 + Run Keyword And Ignore Error fill tender contact person ${data}
63 64 # Run Keyword And Ignore Error Execute Javascript $('a.btn.btn-default.btn-update.js-form-popup-add').click()
64 65
65 66 fill tender form 2 stage
... ... @@ -313,10 +314,10 @@ fill tender item form in opened popup
313 314 ${street_address} = get from dictionary by keys ${data} deliveryAddress streetAddress
314 315 run keyword if condition is not none ${street_address} input text to visible input ${item_form_popup_delivery_street_address_input_locator} ${street_address}
315 316 ${delivery_start_date} = get from dictionary by keys ${data} deliveryDate startDate
316   - ${delivery_start_date} = parse_deliveryPeriod_date ${delivery_start_date}
  317 + ${delivery_start_date} = Run keyword If '${delivery_start_date}' != '${None}' parse_deliveryPeriod_date ${delivery_start_date}
317 318 run keyword if condition is not none ${delivery_start_date} run keyword and ignore error input datetime to exist visible input ${item_form_popup_delivery_start_date_input_locator} ${delivery_start_date}
318 319 ${delivery_end_date} = get from dictionary by keys ${data} deliveryDate endDate
319   - ${delivery_end_date} = parse_deliveryPeriod_date ${delivery_end_date}
  320 + ${delivery_end_date} = Run keyword If '${delivery_end_date}' != '${None}' parse_deliveryPeriod_date ${delivery_end_date}
320 321 run keyword if condition is not none ${delivery_end_date} run keyword and ignore error input text ${item_form_popup_delivery_end_date_input_locator} ${delivery_end_date}
321 322 ## run keyword if condition is not none ${delivery_end_date} run keyword and ignore error input datetime to exist visible input ${item_form_popup_delivery_end_date_input_locator} ${delivery_end_date}
322 323
... ... @@ -642,3 +643,13 @@ fix awards data in global Users variable
642 643 \ continue for loop if '${status}' != 'PASS'
643 644 \ set to object ${USERS.users['${username}'].tender_data.data} awards ${award_data}
644 645 \ exit for loop
  646 +
  647 +fill tender contact person
  648 + [Arguments] ${data}
  649 + [Documentation] заповнює відкриту форму згідно вказаних даних
  650 + run keyword and ignore error open popup by btn locator ${tender_form_cp_edit_btn_locator}
  651 + ${organization_name_en} = get from dictionary by keys ${data} procuringEntity name_en
  652 + run keyword if condition is not none ${organization_name_en} input text to visible input ${tender_form_organization_name_en_input_locator} ${organization_name_en}
  653 + ${contact_point_name_en} = get from dictionary by keys ${data} procuringEntity contactPoint name_en
  654 + run keyword if condition is not none ${contact_point_name_en} input text to visible input ${tender_form_contact_point_name_en_input_locator} ${contact_point_name_en}
  655 + submit current visible popup
... ...
... ... @@ -109,6 +109,9 @@ ${tender_form_item_edit_btn_locator} = jquery=.form
109 109 #negotiation
110 110 ${tender_form_general_cause_input_locator} = jquery=[id$="form-cause"]
111 111 ${tender_form_general_cause_description_input_locator} = jquery=[id$="form-cause_description"]
  112 +${tender_form_cp_edit_btn_locator} = jquery=[id="headingContactPoint"] a[data-url="#contactpoint-form-popup"]
  113 +${tender_form_organization_name_en_input_locator} = jquery=[id*="organization_name_en"]
  114 +${tender_form_contact_point_name_en_input_locator} = jquery=[id*="contact_point_name_en"]
112 115
113 116 #Tests Files.Complaints
114 117 ${tender_form_auction_skip_mode_input_locator} = jquery=input[id$="form-auction_skip_mode"]
... ...
Please register or login to post a comment