frameworkagreement

Playtenders
1 parent add2effd
Showing 3 changed files with 57 additions and 5 deletions
playtender.robot
playtender_viewer.robot
playtender_viewer_variables.robot
--- a/playtender.robot
View file @9366056
+++ b/playtender.robot
View file @9366056
@@ -207,6 +207,7 @@ Resource                                                        playtender_agree
     # fix for preventing error "Resolving variable '${award.value.amount}' failed: AttributeError: value" in next keywords for owner role
 ##    run keyword if                                              ${is_test_role_owner} and '${field_name}' in 'awards[0].complaintPeriod.endDate awards[1].complaintPeriod.endDate awards[2].complaintPeriod.endDate awards[3].complaintPeriod.endDate'  fix awards data in global Users variable  ${username}
+    run keyword if                                              '${field_name}' == 'maxAwardsCount'  submit form and check result   ${bid_form_refresh_btn_locator}  ${bid_form_refresh_success_msg}  ${tender_created_checker_element_locator}  ${true}
     Run Keyword And Return If                                   '${field_name}' == 'budget.amount'   playtender.Отримати інформацію із плану  ${username}  ${tender_uaid}  ${field_name}
     open tender page by uaid                                    ${tender_uaid}
     Run Keyword And Return If                                   '${field_name}' == 'lots[0].minimalStep.currency'   Отримати інформацію із лоту minimalStep.currency  ${field_name}
@@ -214,7 +215,7 @@ Resource                                                        playtender_agree
     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[0].description'   Отримати інформацію із лоту description  ${field_name}
-    Run Keyword And Return If                                   '${field_name}' == 'value.valueAddedTaxIncluded'   Отримати інформацію із value.valueAddedTaxIncluded  ${field_name}
+    Run Keyword And Return If                                   '${field_name}' == 'value.valueAddedTaxIncluded'   Отримати інформацію із value.valueAddedTaxIncluded
     Run Keyword And Return If                                   '${field_name}' == 'complaintPeriod.endDate'   Отримати інформацію із complaintPeriod.endDate
     Run Keyword And Return If                                   '${field_name}' == 'items[0].deliveryLocation.latitude'   Fail   Поле не відображаем
     run keyword if                                              '${field_name}' == 'status'  wait for tender status
@@ -231,6 +232,8 @@ Resource                                                        playtender_agree
     Run Keyword And Return If                                   '${field_name}' == 'lots[0].value.amount'   Отримати інформацію із lots[0].value.amount
     Run Keyword And Return If                                   '${field_name}' == 'lots[0].minimalStep.amount'   Отримати інформацію із lots[0].minimalStep.amount
     Run Keyword And Return If                                   '${field_name}' == 'contracts[1].value.amountNet'   Отримати інформацію із contracts[1].value.amountNet
+    Run Keyword And Return If                                   '${field_name}' == 'contracts[1].value.amount'   Отримати інформацію із contracts[1].value.amount
+    Run Keyword And Return If                                   '${field_name}' == 'contracts[1].value.dateSigned'   Отримати інформацію із contracts[1].dateSigned
 #    Run Keyword And Return If                                   '${field_name}' == 'budget.amount'   Отримати інформацію із плану  ${username}  ${tender_uaid}  ${field_name}
     ${field_name} =                                             set variable  tender.${field_name}.value
     ${value} =                                                  get field_value by field_name on opened page  ${field_name}
@@ -955,15 +958,32 @@ Resource                                                        playtender_agree
     [Documentation]                                             Завантажити файл з doc_id в заголовку для тендера tender_uaid в
     ...                                                         директорію OUTPUT_DIR для перевірки вмісту цього файлу.
+    Run Keyword And Return If                                   '${SUITE_NAME}' == '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}
+    ${tender_new_doc_locator} =                                 replace string  ${tender_new_doc_contract_locator_tpl}  %doc_id%  ${doc_id}
     wait until page contains element with reloading             ${tender_new_doc_locator}
+    ${tender_new_doc__title_locator} =                          replace string  ${tender_new_doc_contract_title_locator_tpl}  %doc_id%  ${doc_id}
+
     ${file_link} =                                              Execute Javascript  return $('.docs__list .docs__item.js-item:first a.doc__link[href*="https://public-docs-staging.prozorro.gov.ua"]').val('.docs__list .docs__item.js-item:first a.doc__link[href*="https://public-docs-staging.prozorro.gov.ua"]').attr("href")
     ${file_name} =                                              get text  ${tender_new_doc_locator}
     download_file  ${file_link}  ${file_name}  ${OUTPUT_DIR}
     [return]                                                    ${file_name}
+Отримати документ до контракту
+    [Arguments]                                                 ${username}  ${tender_uaid}  ${doc_id}
+    [Documentation]                                             Завантажити файл з doc_id в заголовку для тендера tender_uaid в
+    ...                                                         директорію OUTPUT_DIR для перевірки вмісту цього файлу.
+
+    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}
+
+    ${file_link} =                                              Execute Javascript  return $('#contracts-pjax div a.doc__link[href*="https://public-docs-staging.prozorro.gov.ua"]').attr("href")
+    ${file_name} =                                              get text  ${tender_new_doc_locator}
+    download_file  ${file_link}  ${file_name}  ${OUTPUT_DIR}
+    [return]                                                    ${file_name}
+
 Отримати документ до лоту
     [Arguments]                                                 ${username}  ${tender_uaid}  ${lot_id}  ${doc_id}
--- a/playtender_viewer.robot
View file @9366056
+++ b/playtender_viewer.robot
View file @9366056
@@ -355,6 +355,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}
 #заготовка
     ${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}
@@ -366,6 +367,19 @@ get value from lot
     #${return_value} =                                           get value by locator on opened page  ${tender_new_doc_locator}
     [return]                                                    ${return_value}
+Отримати інформацію із документа title контракту
+    [Arguments]                                                 ${doc_id}
+    [Documentation]                                             Отримати значення поля title з документу контракту з doc_id в описі для тендера tender_uaid.
+
+#заготовка
+    ${tender_new_doc_locator} =                                 replace string  ${tender_new_doc_contract_locator_tpl}  %doc_id%  ${doc_id}
+    wait until page contains element with reloading             ${tender_new_doc_locator}
+
+    ${tender_new_doc__title_locator} =                          replace string  ${tender_new_doc_contract_title_locator_tpl}  %doc_id%  ${doc_id}
+
+    ${return_value} =                                           Execute Javascript  return ${tender_new_doc__title_locator}
+    [return]                                                    ${return_value}
+
 wait for tender status
     [Documentation]                                             Очикування відповідного статусу закупівлі, в залежності від кейворда
@@ -484,7 +498,19 @@ Wait For QualificationsPeriodEnd
 Отримати інформацію із contracts[1].value.amountNet
     [Documentation]                                             Отримати значення поля contracts[1].value.amountNet
-    ${return_value} =                                           get value by locator on opened page  ${tender_contracts_0_status_value_locator}
+    ${return_value} =                                           get value by locator on opened page  ${tender_contracts_1_amountnet_value_locator}
+    [return]                                                    ${return_value}
+
+Отримати інформацію із contracts[1].value.amount
+    [Documentation]                                             Отримати значення поля contracts[1].value.amount
+
+    ${return_value} =                                           get value by locator on opened page  ${tender_contracts_1_amount_value_locator}
+    [return]                                                    ${return_value}
+
+Отримати інформацію із contracts[1].dateSigned
+    [Documentation]                                             Отримати значення поля contracts[1].dateSigned
+
+    ${return_value} =                                           get value by locator on opened page  ${tender_contracts_1_datesigned_value_locator}
     [return]                                                    ${return_value}
 Wait For contractactive
@@ -578,7 +604,8 @@ Wait date
 Отримати інформацію із agreementDuration
     [Documentation]                                             Отримати значення поля agreementDuration для тендера tender_uaid.
-    ${return_value} =                                           get value by locator on opened page  ${tender_agreementduration_value_locator}
+    ${return_value} =                                           get value by locator on opened page  ${tender_agreement_duration_value_locator}
+#    ${return_value} =                                           get value by locator on opened page  ${tender_agreementduration_value_locator}
     [return]                                                    ${return_value}
 Отримати інформацію із agreements[0].agreementID
--- a/playtender_viewer_variables.robot
View file @9366056
+++ b/playtender_viewer_variables.robot
View file @9366056
@@ -106,6 +106,8 @@ ${tender_auctionPeriod_startDate_value_locator} =                   jquery=#tend
 ${tender_auctionPeriod_endDate_value_locator} =                     jquery=#tender-general-info .auction-end-date.hidden
 ${tender_lots_0_auctionPeriod_endDate_value_locator} =              jquery=#tender-general-info .auction-end-date.hidden
+${tender_new_doc_contract_locator_tpl} =                            jquery=#contracts-pjax div[data-title*="%doc_id%"]
+${tender_new_doc_contract_title_locator_tpl} =                      $('#contracts-pjax div[data-title*="%doc_id%"]').attr("data-title")
 #wait for status
 ${tender_status_active_tendering_value_locator} =                   xpath=//*[contains(text(), "active.tendering")]
@@ -208,6 +210,9 @@ ${tender_awards_0_status_value_locator} =                           jquery=.awar
 #${tender_contracts_0_status_value_locator} =                        jquery=#contracts-pjax .tabs__pane--visible .definitions__item--offset-big .badge__text
 ${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_amount_value_locator} =                        jquery=#contracts-pjax .tender-contract-info-wrapper .amount-source.hidden
+${tender_contracts_1_datesigned_value_locator} =                    jquery=#contracts-pjax .tender-contract-info-wrapper .date-signed-source.hidden
 ${wait_msg_contract} =                                              Завантаження контракту буде
@@ -218,7 +223,7 @@ ${tender_agreementDuration_value_locator} =                         jquery=#tend
 ${tender_agreements_0_status_value_locator} =                       jquery=.tabs__pane--visible[id*="tab-agreement-contract"] .status-source.hidden
 ${tender_agreements_status_active_value_locator} =                  jquery=.tabs__pane--visible[id*="tab-agreement-contract"] .status-source.hidden:contains(active)
-${tender_agreementduration_value_locator} =                         jquery=#tender-general-info .agreement-duration-source.hidden
+${tender_agreement_duration_value_locator} =                        jquery=#tender-general-info .agreement-duration-source.hidden
 ${tender_agreement_agreementid_value_locator} =                     jquery=#agreement-contracts-list .agreement-info-wrapper.info-wrapper .agreement-id .value
 ${tender_agreement_items0_quantity_value_locator} =                 jquery=.item-item-wrapper .hidden.info-wrapper .quantity-source
 ${tender_agreement_lots0_value_amount_value_locator} =              jquery=.tabs__pane--lot.tabs__pane--visible .lot-info-wrapper .budget-source.hidden