frameworkagreement/ROLE=viewer

Playtenders
1 parent 7c1d8ce1
Showing 4 changed files with 19 additions and 6 deletions
playtender.robot
playtender_agreement_variables.robot
playtender_claim.robot
playtender_viewer.robot
--- a/playtender.robot
View file @4db6e67
+++ b/playtender.robot
View file @4db6e67
@@ -1017,7 +1017,7 @@ Resource                                                        playtender_agree
     [Documentation]                                             Завантажити файл з doc_id в заголовку для тендера tender_uaid в
     ...                                                         директорію OUTPUT_DIR для перевірки вмісту цього файлу.
-    Run Keyword And Return If                                   '${SUITE_NAME}' == 'Contract Signing'   Отримати документ до контракту  ${username}  ${tender_uaid}  ${doc_id}
+    Run Keyword And Return If                                   '${SUITE_NAME}' == 'Tests Files.Contract Signing'   Отримати документ до контракту  ${username}  ${tender_uaid}  ${doc_id}
     open tender page by uaid                                    ${tender_uaid}
     ${tender_new_doc_locator} =                                 replace string  ${tender_new_doc_locator_tpl}  %doc_id%  ${doc_id}
     wait until page contains element with reloading             ${tender_new_doc_locator}
@@ -1285,6 +1285,7 @@ Resource                                                        playtender_agree
     ...  ELSE                                                   Run Keyword If  '${field_name}' == 'changes[0].rationale'  get value by locator on opened page  ${agreement_changes_0_rationale_value_locator}
     ...  ELSE                                                   Run Keyword If  '${field_name}' == 'changes[0].modifications[0].itemId'  get value by locator on opened page  ${agreement_changes_0_modifications_0_itemId_value_locator}
     ...  ELSE                                                   Run Keyword If  '${field_name}' == 'changes[0].modifications[0].factor'  get value by locator on opened page  ${agreement_changes_0_modifications_0_factor_value_locator}
+    ...  ELSE                                                   Run Keyword If  '${field_name}' == 'changes[0].modifications[0].addend'  get value by locator on opened page  ${agreement_changes_0_modifications_0_addend_value_locator}
     ...  ELSE                                                   Run Keyword If  '${field_name}' == 'changes[1].rationaleType'   get value by locator on opened page  ${agreement_changes_1_rationaleType_value_locator}
     ...  ELSE                                                   Run Keyword If  '${field_name}' == 'changes[1].rationale'  get value by locator on opened page  ${agreement_changes_1_rationale_value_locator}
     ...  ELSE                                                   Run Keyword If  '${field_name}' == 'changes[1].modifications[0].itemId'  get value by locator on opened page  ${agreement_changes_1_modifications_0_itemId_value_locator}
@@ -1301,6 +1302,11 @@ Resource                                                        playtender_agree
     ...  ELSE                                                   Run Keyword If  '${field_name}' == 'changes[3].modifications[0].factor'   get value by locator on opened page  ${agreement_changes_2_modifications_0_factor_value_locator}
     ...  ELSE                                                   Run Keyword If  '${field_name}' == 'changes[3].modifications[0].contractId'   get value by locator on opened page  ${}
     ...  ELSE                                                   Run Keyword If  '${field_name}' == 'changes[3].status'   get value by locator on opened page  ${agreement_changes_3_status_value_locator}
+    Run Keyword If                                              'rationaleType' in '${field_name}'  Run Keywords
+    ...                                                         run keyword if  '${return_value}' == 'Зміна ціни за одиницю товару'   ${return_value} =   set variable  itemPriceVariation
+    ...  AND                                                    run keyword if  '${return_value}' == 'Зміна ціни у зв’язку із зміною ставок податків і зборів'   ${return_value} =   set variable  taxRate
+    ...  AND                                                    run keyword if  '${return_value}' == 'Зміна сторонніх показників (курсу, тарифів...)'   ${return_value} =   set variable  thirdParty
+    ...  AND                                                    run keyword if  '${return_value}' == 'Припинення участі у рамковій угоді учасника'   ${return_value} =   set variable  partyWithdrawal
     [Return]                                                    ${return_value}
 ########################################################################################################################
--- a/playtender_agreement_variables.robot
View file @4db6e67
+++ b/playtender_agreement_variables.robot
View file @4db6e67
@@ -16,14 +16,17 @@ ${agreement_changes_0_status_value_locator} =                       jquery=.tabs
 ${agreement_changes_0_rationaleType_value_locator} =                jquery=.tabs__pane.tabs__pane--visible[id*="tab-agreement-change"] .agreement-contract-info-wrapper.info-wrapper .info-row.rationale-type span.value
 ${agreement_changes_0_rationale_value_locator} =                    jquery=.tabs__pane.tabs__pane--visible[id*="tab-agreement-change"] .agreement-contract-info-wrapper.info-wrapper .info-row.rationale span.value
-${agreement_changes_0_modifications_0_itemId_value_locator} =       jquery=.tabs__pane.tabs__pane--visible[id*="tab-agreement-change"] .agreement-contract-info-wrapper.info-wrapper .info-row.modification0-itemId.hidden
-${agreement_changes_0_modifications_0_addend_value_locator} =       jquery=.tabs__pane.tabs__pane--visible[id*="tab-agreement-change"] .agreement-contract-info-wrapper.info-wrapper .info-row.modification0-factor.hidden
+${agreement_changes_0_modifications_0_itemId_value_locator} =       jquery=.tabs__pane.tabs__pane--visible[id*="tab-agreement-change"]:nth(0) .agreement-contract-info-wrapper.info-wrapper .info-row.modification0-itemId.hidden
+${agreement_changes_0_modifications_0_factor_value_locator} =       jquery=.tabs__pane.tabs__pane--visible[id*="tab-agreement-change"]:nth(0) .agreement-contract-info-wrapper.info-wrapper .info-row.modification0-factor.hidden
+${agreement_changes_0_modifications_0_factor_value_type} =          float
+${agreement_changes_0_modifications_0_addend_value_locator} =       jquery=.tabs__pane.tabs__pane--visible[id*="tab-agreement-change"]:nth(0) .agreement-contract-info-wrapper.info-wrapper .info-row.modification0-factor.hidden
 ${agreement_changes_1_rationaleType_value_locator} =                jquery=.tabs__pane[id*="tab-agreement-change"]:nth(1) .agreement-contract-info-wrapper.info-wrapper .info-row.rationale-type span.value
 ${agreement_changes_1_rationale_value_locator} =                    jquery=.tabs__pane[id*="tab-agreement-change"]:nth(1) .agreement-contract-info-wrapper.info-wrapper .info-row.rationale span.value
 ${agreement_changes_1_modifications_0_itemId_value_locator} =       jquery=.tabs__pane[id*="tab-agreement-change"]:nth(1) .agreement-contract-info-wrapper.info-wrapper .info-row.modification0-itemId.hidden
 ${agreement_changes_1_modifications_0_factor_value_locator} =       jquery=.tabs__pane[id*="tab-agreement-change"]:nth(1) .agreement-contract-info-wrapper.info-wrapper .info-row.modification0-factor.hidden
+${agreement_changes_1_modifications_0_factor_value_type} =          float
 ${agreement_changes_1_status_value_locator} =                       jquery=.tabs__pane[id*="tab-agreement-change"]:nth(1) .agreement-contract-info-wrapper.info-wrapper .info-row.status.hidden
 ${agreement_changes_2_rationaleType_value_locator} =                jquery=.tabs__pane[id*="tab-agreement-change"]:nth(2) .agreement-contract-info-wrapper.info-wrapper .info-row.rationale-type span.value
@@ -31,6 +34,7 @@ ${agreement_changes_2_rationale_value_locator} =                    jquery=.tabs
 ${agreement_changes_2_modifications_0_itemId_value_locator} =       jquery=.tabs__pane[id*="tab-agreement-change"]:nth(2) .agreement-contract-info-wrapper.info-wrapper .info-row.modification0-itemId.hidden
 ${agreement_changes_2_modifications_0_factor_value_locator} =       jquery=.tabs__pane[id*="tab-agreement-change"]:nth(2) .agreement-contract-info-wrapper.info-wrapper .info-row.modification0-factor.hidden
+${agreement_changes_2_modifications_0_factor_value_type} =          float
 ${agreement_changes_2_status_value_locator} =                       jquery=.tabs__pane[id*="tab-agreement-change"]:nth(2) .agreement-contract-info-wrapper.info-wrapper .info-row.status.hidden
 ${agreement_changes_3_rationaleType_value_locator} =                jquery=.tabs__pane[id*="tab-agreement-change"]:nth(3) .agreement-contract-info-wrapper.info-wrapper .info-row.rationale-type span.value
@@ -38,6 +42,7 @@ ${agreement_changes_3_rationale_value_locator} =                    jquery=.tabs
 ${agreement_changes_3_modifications_0_itemId_value_locator} =       jquery=.tabs__pane[id*="tab-agreement-change"]:nth(3) .agreement-contract-info-wrapper.info-wrapper .info-row.itemid span.value
 ${agreement_changes_3_modifications_0_factor_value_locator} =       jquery=.tabs__pane[id*="tab-agreement-change"]:nth(3) .agreement-contract-info-wrapper.info-wrapper .info-row.modification0-factor.hidden
+${agreement_changes_3_modifications_0_factor_value_type} =          float
 ${agreement_changes_3_status_value_locator} =                       jquery=.tabs__pane[id*="tab-agreement-change"]:nth(3) .agreement-contract-info-wrapper.info-wrapper .info-row.status.hidden
 ${agreement_form_refresh_success_msg} =                             Рамкова угода оновлена.
--- a/playtender_claim.robot
View file @4db6e67
+++ b/playtender_claim.robot
View file @4db6e67
@@ -326,8 +326,9 @@ Change the status of the complaint
     [Documentation]                                             Змінює статус скарги complaintID
     open tender page by uaid                                    ${tender_uaid}
-    log many  ${confirmation_data}
-    Run Keyword If                                              "АМКУ по скарзі пре-кваліфікації учасника" in "${TEST TAGS}" or "АМКУ по скарзі на визначення переможця" in "${TEST TAGS}"   amku result  ${username}  ${tender_uaid}  ${complaintID}  ${confirmation_data}
+    log many  ${TEST TAGS}
+#    Run Keyword If                                              "АМКУ по скарзі пре-кваліфікації учасника" in "${TEST TAGS}" or "АМКУ по скарзі на визначення переможця" in "${TEST TAGS}"   amku result  ${username}  ${tender_uaid}  ${complaintID}  ${confirmation_data}
+    Run Keyword If                                              "\u0417\u0430\u043c\u043e\u0432\u043d\u0438\u043a \u0432\u0438\u043a\u043e\u043d\u0443\u0454" in "${TEST TAGS}" or "АМКУ по скарзі на визначення переможця" in "${TEST TAGS}"   amku result  ${username}  ${tender_uaid}  ${complaintID}  ${confirmation_data}
     capture page screenshot
     click visible element                                       ${claim_page_open_btn_locator}
     capture page screenshot
--- a/playtender_viewer.robot
View file @4db6e67
+++ b/playtender_viewer.robot
View file @4db6e67
@@ -356,7 +356,7 @@ get value from lot
     [Arguments]                                                 ${doc_id}
     [Documentation]                                             Отримати значення поля title з документу з doc_id в описі для тендера tender_uaid.
-    Run Keyword And Return If                                   '${SUITE_NAME}' == 'Contract Signing'   Отримати інформацію із документа title контракту  ${doc_id}
+    Run Keyword And Return If                                   '${SUITE_NAME}' == 'Tests Files.Contract Signing'   Отримати інформацію із документа title контракту  ${doc_id}
 #заготовка
     ${tender_new_doc_locator} =                                 replace string  ${tender_new_doc_locator_tpl}  %doc_id%  ${doc_id}
     wait until page contains element with reloading             ${tender_new_doc_locator}
@@ -519,6 +519,7 @@ Wait For QualificationsPeriodEnd
 Отримати інформацію із contracts[1].value.amountNet
     [Documentation]                                             Отримати значення поля contracts[1].value.amountNet
+    submit form and check result                                ${bid_form_refresh_btn_locator}  ${bid_form_refresh_success_msg}  ${tender_created_checker_element_locator}  ${true}
     ${return_value} =                                           get value by locator on opened page  ${tender_contracts_1_amountnet_value_locator}  ${tender_contracts_1_amountnet_value_type}
     [return]                                                    ${return_value}