Administrator / playtender-robot_tests · Commits

Commit 2b2ec81326466b4cbb9f357ddf395efadc4e4873

Authored by Playtenders
1 parent 5fc2d50d
build: skipped

next

Inline Side-by-side
Showing 1 changed file with 23 additions and 20 deletions
... ... @@ -90,13 +90,13 @@ Login
90 90 Run Keyword If '${procurementMethodType}' == 'negotiation' Go To ${BROKERS['playtender'].basepage}/utils/config?tacceleration=1080
91 91
92 92 Selenium2Library.Switch Browser ${user}
93   - Run Keyword If '${procurementMethodType}' == 'belowThreshold' and 'funders' not in ${tender_data_keys} Go To ${BROKERS['playtender'].basepage}/tender/create?type=${procurementMethodType}&multilot=0
94   - Run Keyword If '${procurementMethodType}' != 'belowThreshold' or 'funders' in ${tender_data_keys} Go To ${BROKERS['playtender'].basepage}/tender/create?type=${procurementMethodType}
  93 + Run Keyword If '${procurementMethodType}' == 'belowThreshold' and 'lots' not in ${tender_data_keys} Go To ${BROKERS['playtender'].basepage}/tender/create?type=${procurementMethodType}&multilot=0
  94 + Run Keyword If '${procurementMethodType}' != 'belowThreshold' or 'lots' in ${tender_data_keys} Go To ${BROKERS['playtender'].basepage}/tender/create?type=${procurementMethodType}
95 95 Wait Until Page Contains Створення закупівлі 10
96 96
97 97 ### BOF - Reporting ###
98 98 Run Keyword And Return If '${procurementMethodType}' == 'reporting' Створити тендер без лотів ${user} ${tender_data}
99   - Run Keyword And Return If '${procurementMethodType}' == 'belowThreshold' and 'funders' not in ${tender_data_keys} Створити тендер без лотів ${user} ${tender_data}
  99 + Run Keyword And Return If '${procurementMethodType}' == 'belowThreshold' and 'lots' not in ${tender_data_keys} Створити тендер без лотів ${user} ${tender_data}
100 100 ### EOF - Reporting ###
101 101
102 102 ${title}= Get From Dictionary ${tender_data.data} title
... ... @@ -384,8 +384,8 @@ Login
384 384 Run Keyword If 'deliveryDate' in ${item_keys} Input DateTime XPath div[contains(@class, 'active')]//${wraper}//div[contains(@class, 'active')]//div[contains(@class, 'form-group field-item${playtender_proc_type}form')]//input[contains(@id, '-delivery_start_date')] ${ARGUMENTS[0].deliveryDate.startDate}
385 385 Run Keyword If 'deliveryDate' in ${item_keys} Input DateTime XPath div[contains(@class, 'active')]//${wraper}//div[contains(@class, 'active')]//div[contains(@class, 'form-group field-item${playtender_proc_type}form')]//input[contains(@id, '-delivery_end_date')] ${ARGUMENTS[0].deliveryDate.endDate}
386 386
387   - #Run Keyword If 'deliveryLocation' in ${item_keys}
388   - #... InputItemDeliveryLocationByWrapper \#collapseLots div[data-type='lot'].active div[data-type='item'].active ${ARGUMENTS[0].deliveryLocation} ${ARGUMENTS[2]}
  387 + Run Keyword If 'deliveryLocation' in ${item_keys}
  388 + ... InputItemDeliveryLocationByWrapper \#collapseLots div[data-type='lot'].active div[data-type='item'].active ${ARGUMENTS[0].deliveryLocation} ${ARGUMENTS[2]}
389 389
390 390 Додати предмет By Wrapper
391 391 [Arguments] ${wrapper} ${data} ${procurementMethodType}
... ... @@ -422,8 +422,8 @@ InputItemDeliveryAddressByWrapper
422 422 InputItemDeliveryLocationByWrapper
423 423 [Arguments] ${wrapper} ${data} ${procurementMethodType}
424 424
425   - Execute JavaScript jQuery("${wrapper} input[id$='-delivery_location_latitude']").val("${data.latitude}");
426   - Execute JavaScript jQuery("${wrapper} input[id$='-delivery_location_longitude']").val("${data.longitude}");
  425 + run keyword and ignore error Execute JavaScript jQuery("${wrapper} input[id$='-delivery_location_latitude']").val("${data.latitude}");
  426 + run keyword and ignore error Execute JavaScript jQuery("${wrapper} input[id$='-delivery_location_longitude']").val("${data.longitude}");
427 427
428 428 InputItemDeliveryDateByWrapper
429 429 [Arguments] ${wrapper} ${data} ${procurementMethodType}
... ... @@ -2039,8 +2039,8 @@ Save Proposal
2039 2039 Run Keyword If 'status' == '${arguments[2]}' and '${current_tender_uaid}' != '${arguments[1]}' Sleep 3
2040 2040 Run Keyword And Return If 'status' == '${arguments[2]}' and '${current_tender_uaid}' != '${arguments[1]}' get_invisible_text xpath=//*[contains(@class, 'hidden stage2.opstatus')]
2041 2041 Run Keyword And Return If 'status' == '${arguments[2]}' Отримати інформацію із тендера status
2042   - Run Keyword And Return If 'enquiryPeriod.startDate' == '${arguments[2]}' Отримати інформацію із тендера enquiryPeriod.startDate
2043   - Run Keyword And Return If 'enquiryPeriod.endDate' == '${arguments[2]}' Отримати інформацію із тендера enquiryPeriod.endDate
  2042 + Run Keyword And Return If 'enquiryPeriod.startDate' == '${arguments[2]}' get_invisible_text jquery=.timeline-info-wrapper .enquiry-period-start-date.hidden
  2043 + Run Keyword And Return If 'enquiryPeriod.endDate' == '${arguments[2]}' get_invisible_text jquery=.timeline-info-wrapper .enquiry-period-end-date.hidden
2044 2044 Run Keyword And Return If 'complaintPeriod.startDate' == '${arguments[2]}' Отримати інформацію із тендера complaintPeriod.startDate
2045 2045 Run Keyword And Return If 'complaintPeriod.endDate' == '${arguments[2]}' Отримати інформацію із тендера complaintPeriod.endDate
2046 2046 Run Keyword And Return If 'title' == '${arguments[2]}' Отримати інформацію із тендера title
... ... @@ -2177,6 +2177,11 @@ Save Proposal
2177 2177 Run Keyword And Return If 'items[1].deliveryLocation.latitude' == '${arguments[2]}' Get invisible text number by locator jquery=div[id^='accordionItems']:visible .panel-item-collapse.in .item-info-wrapper .delivery-latitude.hidden
2178 2178 Run Keyword And Return If 'items[1].deliveryLocation.longitude' == '${arguments[2]}' Get invisible text number by locator jquery=div[id^='accordionItems']:visible .panel-item-collapse.in .item-info-wrapper .delivery-longitude.hidden
2179 2179
  2180 + ${item2NeedToBeVisible}= Run Keyword And Return Status Should Start With ${arguments[2]} items[2]
  2181 + Run Keyword If ${item2NeedToBeVisible} Execute JavaScript robottesthelpfunctions.showitembyindex(2);
  2182 + Run Keyword If ${item2NeedToBeVisible} Sleep 2
  2183 + Run Keyword And Return If 'items[2].description' == '${arguments[2]}' Get Text jquery=div[id^='accordionItems']:visible .panel-item-collapse.in .item-info-wrapper p.title .value
  2184 +
2180 2185 ### BOF - BelowFunders ###
2181 2186 ${funderWrapper}= Set Variable \#funderorganizationinfo
2182 2187 Run Keyword And Return If '${arguments[2]}' == 'funders[0].name' get_invisible_text jquery=${funderWrapper} .name.hidden
... ... @@ -3268,21 +3273,19 @@ Switch To Complaints
3268 3273 UserChangeOrgnizationInfo
3269 3274 [Arguments] ${data}
3270 3275
  3276 + ${keys}= Get Dictionary Keys ${data}
  3277 +
3271 3278 Go To ${BROKERS['playtender'].basepage}/user/profile
3272 3279 Wait Until Page Contains Інформація про компанію 10
3273 3280 Sleep 1
3274 3281
3275   - Input text id=profileform-organization_name ${data.name}
3276   - Input text id=profileform-organization_edrpou ${data.identifier.id}
3277   - JsSetScrollToElementBySelector \#profileform-organization_region_id
3278   - ${is_address.region}= Run Keyword And Return Status Dictionary Should Contain Key ${data} address.region
3279   - Run Keyword If ${is_address.region} Select From List By Label jquery=#profileform-organization_region_id ${data.address.region}
3280   - ${is_address.postalCode}= Run Keyword And Return Status Dictionary Should Contain Key ${data} address.postalCode
3281   - Run Keyword If ${is_address.postalCode} Input Text jquery=#profileform-organization_postal_code ${data.address.postalCode}
3282   - ${is_address.locality}= Run Keyword And Return Status Dictionary Should Contain Key ${data} address.locality
3283   - Run Keyword If ${is_address.locality} Input Text jquery=#profileform-organization_locality ${data.address.locality}
3284   - ${is_address.streetAddress}= Run Keyword And Return Status Dictionary Should Contain Key ${data} address.streetAddress
3285   - Run Keyword If ${is_address.streetAddress} Input Text jquery=#profileform-organization_street_address ${data.address.streetAddress}
  3282 + Run Keyword If 'name' in ${keys} Input text id=profileform-organization_name ${data.name}
  3283 + Run Keyword If 'identifier' in ${keys} Input text id=profileform-organization_edrpou ${data.identifier.id}
  3284 + Run Keyword If 'address' in ${keys} JsSetScrollToElementBySelector \#profileform-organization_region_id
  3285 + Run Keyword If 'address' in ${keys} Select From List By Label jquery=#profileform-organization_region_id ${data.address.region}
  3286 + Run Keyword If 'address' in ${keys} Input Text jquery=#profileform-organization_postal_code ${data.address.postalCode}
  3287 + Run Keyword If 'address' in ${keys} Input Text jquery=#profileform-organization_locality ${data.address.locality}
  3288 + Run Keyword If 'address' in ${keys} Input Text jquery=#profileform-organization_street_address ${data.address.streetAddress}
3286 3289
3287 3290 JsSetScrollToElementBySelector \#user-profile-form .js-submit-btn
3288 3291 Click Element jquery=\#user-profile-form .js-submit-btn
... ...
Please register or login to post a comment