fix

Playtenders
1 parent ddd7221e
Showing 5 changed files with 26 additions and 4 deletions
playtender.robot
playtender_tender.robot
playtender_variables.robot
playtender_viewer.robot
playtender_viewer_variables.robot
--- a/playtender.robot
View file @f374482
+++ b/playtender.robot
View file @f374482
@@ -214,6 +214,7 @@ Resource                                                        playtender_agree
     Run Keyword And Return If                                   '${field_name}' == 'lots[0].minimalStep.valueAddedTaxIncluded'   Отримати інформацію із лоту minimalStep.valueAddedTaxIncluded  ${field_name}
     Run Keyword And Return If                                   '${field_name}' == 'lots[0].value.valueAddedTaxIncluded'   Отримати інформацію із лоту value.valueAddedTaxIncluded  ${field_name}
     Run Keyword And Return If                                   '${field_name}' == 'lots[0].title'   Отримати інформацію із лоту title  ${field_name}
+    Run Keyword And Return If                                   '${field_name}' == 'lots[1].title'   Отримати інформацію із лоту title  ${field_name}
     Run Keyword And Return If                                   '${field_name}' == 'lots[0].description'   Отримати інформацію із лоту description  ${field_name}
     Run Keyword And Return If                                   '${field_name}' == 'value.valueAddedTaxIncluded'   Отримати інформацію із value.valueAddedTaxIncluded
     Run Keyword And Return If                                   '${field_name}' == 'complaintPeriod.endDate'   Отримати інформацію із complaintPeriod.endDate
@@ -648,6 +649,13 @@ Resource                                                        playtender_agree
     Run Keyword And Return                                      Створити вимогу  ${username}  ${tender_uaid}  tender  null  ${claim}  null
+Створити чернетку скарги про виправлення умов лоту
+    [Arguments]                                                 ${username}  ${tender_uaid}  ${claim}  ${lot_id}
+    [Documentation]                                             Створює вимогу claim про виправлення умов закупівлі
+    ...                                                         у статусі draft для тендера tender_uaid.
+
+    Run Keyword And Return                                      Створити вимогу  ${username}  ${tender_uaid}  lot  ${lot_id}  ${claim}  null
+
 Створити чернетку вимоги/скарги на скасування
     [Arguments]                                                 ${username}  ${tender_uaid}  ${claim}  ${index}
     [Documentation]                                             Створює вимоги/скарги claim на скасування
@@ -1307,6 +1315,12 @@ Resource                                                        playtender_agree
     decline lot                                                 ${username}  ${tender_uaid}  ${lot_id}  ${cancellation_reason}  ${cancellation_reasonType}  ${doc_name}  ${cancellation_data}
+Скасувати cancellation
+    [Arguments]  ${username}  ${tender_uaid}  ${cancellations_index}
+    [Documentation]                                             Скасувати cancellation
+
+    cancell cancellation                                        ${username}  ${tender_uaid}  ${cancellations_index}
+
 ########################################################################################################################
 ################################################### END CANCELLATION LOTS AND TENDERS KEYWORDS #########################
 ########################################################################################################################
--- a/playtender_tender.robot
View file @f374482
+++ b/playtender_tender.robot
View file @f374482
@@ -807,3 +807,9 @@ decline lot
 #    ${cancellation} =                                           openprocurement_client.Перевести скасування закупівлі в період очікування  ${username}  ${tender_uaid}  ${cancellation_id}
     Set To Dictionary                                           ${USERS.users['${tender_owner}']}  cancellation_data=${cancellation}
+cancell cancellation
+    [Arguments]  ${username}  ${tender_uaid}  ${cancellations_index}
+    [Documentation]                                             Скасувати cancellation
+
+    open tender page by uaid                                    ${tender_uaid}
+
--- a/playtender_variables.robot
View file @f374482
+++ b/playtender_variables.robot
View file @f374482
@@ -252,6 +252,7 @@ ${tender_lot_switch_tabs_lot_btn_locator_tpl}                       jquery=#lots
 ${tender_lot_1_tabs_item_btn_locator}                               jquery=#lots .tabs__item:first > a
 ${tender_lot_title_value_locator} =                                 jquery=#lots .tabs__content .tabs__pane--visible > span div:first
 #${tender_lot_title_value_locator} =                                 jquery=#lots .tabs__content .tabs__pane--visible > span div.textvalue:first
+${tender_lot1_title_value_locator} =                                jquery=#lots .tabs__content .tabs__pane--lot:last > span div:first
 ${tender_lot_description_value_locator} =                           jquery=#lots .tabs__content .tabs__pane--visible > span div:last
 #${tender_lot_description_value_locator} =                           jquery=#lots .tabs__content .tabs__pane--visible #text-modal-description div.textvalue
 ${tender_lot_value_amount_value_locator} =                          jquery=#lots .tabs__content .tabs__pane--visible .budget-source.hidden
--- a/playtender_viewer.robot
View file @f374482
+++ b/playtender_viewer.robot
View file @f374482
@@ -240,8 +240,9 @@ get value from lot
     [Arguments]                                                 ${lot_id}
     [Documentation]                                             Отримати значення поля title з лоту з lot_id в описі для тендера tender_uaid.
-#    ${tender_lot_title_value_locator} =                         replace string  ${tender_lot_title_value_locator_tpl}  %lot_id%  ${lot_id}
-    ${return_value} =                                           get value by locator on opened page  ${tender_lot_title_value_locator}
+    ${return_value} =                                           Run Keyword If  'lots[0].title' == '${field}'         get value by locator on opened page  ${tender_lot_title_value_locator}
+    ...  ELSE                                                   get value by locator on opened page  ${tender_lot1_title_value_locator}
+
     [return]                                                    ${return_value}
 Отримати інформацію із лоту description
--- a/playtender_viewer_variables.robot
View file @f374482
+++ b/playtender_viewer_variables.robot
View file @f374482
@@ -212,9 +212,9 @@ ${tender_awards_0_status_value_locator} =                           jquery=.awar
 ${tender_contracts_0_status_value_locator} =                        jquery=#contracts-pjax .tabs__pane--visible .status-source.hidden
 ${tender_contracts_status_active_value_locator} =                   jquery=#contracts-pjax .tabs__pane--visible .status-source.hidden:contains(active)
 ${tender_contracts_1_amountnet_value_locator} =                     jquery=#contracts-pjax .tender-contract-info-wrapper .amount-net-source.hidden
+${tender_contracts_1_amountnet_value_type} =                        float
 ${tender_contracts_1_amount_value_locator} =                        jquery=#contracts-pjax .tender-contract-info-wrapper .amount-source.hidden
-${tender_contracts_1_amountnet_value_value_type} =                  float
-${tender_contracts_1_amount_value_value_type} =                     float
+${tender_contracts_1_amount_value_type} =                           float
 ${tender_contracts_1_datesigned_value_locator} =                    jquery=#contracts-pjax .tender-contract-info-wrapper .date-signed-source.hidden
 ${wait_msg_contract} =                                              Завантаження контракту буде