Showing
5 changed files
with
35 additions
and
18 deletions
| @@ -199,8 +199,8 @@ Resource playtender_agree | @@ -199,8 +199,8 @@ Resource playtender_agree | ||
| 199 | open tender search form | 199 | open tender search form |
| 200 | log many ${SUITE_NAME} | 200 | log many ${SUITE_NAME} |
| 201 | log many ${mode} | 201 | log many ${mode} |
| 202 | - Run Keyword If ' ${username}' == 'playtender_Owner' and '${SUITE_NAME}' == 'Tests Files.Contract Signing' and '${mode}' in 'open_framework' GetTenderContract ${tender_uaid} | ||
| 203 | - Run Keyword If '${SUITE_NAME}' == 'Tests Files.04Contract Signing' and '${mode}' in 'open_framework' GetTenderContract ${tender_uaid} | 202 | + Run Keyword If '${SUITE_NAME}' == 'Tests Files.Contract Signing' and '${mode}' in 'open_framework' GetTenderContract ${tender_uaid} |
| 203 | + Run Keyword If '${SUITE_NAME}' == 'Tests Files.04Contract Signing' and '${mode}' in 'open_framework' GetTenderContract ${tender_uaid} | ||
| 204 | go to ${broker_baseurl}/?query%5B%5D=${tender_uaid} | 204 | go to ${broker_baseurl}/?query%5B%5D=${tender_uaid} |
| 205 | input to search form and wait results ${tender_search_form_query_input_locator} ${tender_uaid} ${tender_search_form_result_locator_tpl} | 205 | input to search form and wait results ${tender_search_form_query_input_locator} ${tender_uaid} ${tender_search_form_result_locator_tpl} |
| 206 | 206 | ||
| @@ -1237,12 +1237,12 @@ Resource playtender_agree | @@ -1237,12 +1237,12 @@ Resource playtender_agree | ||
| 1237 | edit unitprices ${tender_uaid} ${contract_data} | 1237 | edit unitprices ${tender_uaid} ${contract_data} |
| 1238 | 1238 | ||
| 1239 | Зареєструвати угоду | 1239 | Зареєструвати угоду |
| 1240 | - [Arguments] ${username} ${tender_uaid} ${startDate} ${endDate} | 1240 | + [Arguments] ${username} ${tender_uaid} ${period} |
| 1241 | [Documentation] Зареєструвати угоду для користувача username для тендера tender_uaid, | 1241 | [Documentation] Зареєструвати угоду для користувача username для тендера tender_uaid, |
| 1242 | ... для поля Дата початку дії угоди задати значення startDate, для дати завершення - endDate. | 1242 | ... для поля Дата початку дії угоди задати значення startDate, для дати завершення - endDate. |
| 1243 | 1243 | ||
| 1244 | open tender page by uaid ${tender_uaid} | 1244 | open tender page by uaid ${tender_uaid} |
| 1245 | - active agreement contract ${startDate} ${endDate} | 1245 | + active agreement contract ${period} |
| 1246 | 1246 | ||
| 1247 | ######################################################################################################################## | 1247 | ######################################################################################################################## |
| 1248 | ################################################### END CONTRACTS KEYWORDS #################################### | 1248 | ################################################### END CONTRACTS KEYWORDS #################################### |
| @@ -1291,22 +1291,22 @@ Resource playtender_agree | @@ -1291,22 +1291,22 @@ Resource playtender_agree | ||
| 1291 | Execute JavaScript window.scrollTo(0, document.body.scrollHeight); | 1291 | Execute JavaScript window.scrollTo(0, document.body.scrollHeight); |
| 1292 | sleep 10 | 1292 | sleep 10 |
| 1293 | ${return_value} = Run Keyword If '${field_name}' == 'changes[0].status' get value by locator on opened page ${agreement_changes_0_status_value_locator} | 1293 | ${return_value} = Run Keyword If '${field_name}' == 'changes[0].status' get value by locator on opened page ${agreement_changes_0_status_value_locator} |
| 1294 | - ... ELSE Run Keyword If '${field_name}' == 'changes[0].rationaleType' get value by locator on opened page ${agreement_changes_0_rationaleType_value_locator} | 1294 | +# ... ELSE Run Keyword If '${field_name}' == 'changes[0].rationaleType' get value by locator on opened page ${agreement_changes_0_rationaleType_value_locator} |
| 1295 | ... ELSE Run Keyword If '${field_name}' == 'changes[0].rationale' get value by locator on opened page ${agreement_changes_0_rationale_value_locator} | 1295 | ... ELSE Run Keyword If '${field_name}' == 'changes[0].rationale' get value by locator on opened page ${agreement_changes_0_rationale_value_locator} |
| 1296 | ... 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} | 1296 | ... 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} |
| 1297 | ... 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} ${agreement_changes_0_modifications_0_factor_value_type} | 1297 | ... 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} ${agreement_changes_0_modifications_0_factor_value_type} |
| 1298 | ... 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} | 1298 | ... 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} |
| 1299 | - ... ELSE Run Keyword If '${field_name}' == 'changes[1].rationaleType' get value by locator on opened page ${agreement_changes_1_rationaleType_value_locator} | 1299 | +# ... ELSE Run Keyword If '${field_name}' == 'changes[1].rationaleType' get value by locator on opened page ${agreement_changes_1_rationaleType_value_locator} |
| 1300 | ... ELSE Run Keyword If '${field_name}' == 'changes[1].rationale' get value by locator on opened page ${agreement_changes_1_rationale_value_locator} | 1300 | ... ELSE Run Keyword If '${field_name}' == 'changes[1].rationale' get value by locator on opened page ${agreement_changes_1_rationale_value_locator} |
| 1301 | ... 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 | ... 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} |
| 1302 | ... ELSE Run Keyword If '${field_name}' == 'changes[1].modifications[0].factor' get value by locator on opened page ${agreement_changes_1_modifications_0_factor_value_locator} ${agreement_changes_1_modifications_0_factor_value_type} | 1302 | ... ELSE Run Keyword If '${field_name}' == 'changes[1].modifications[0].factor' get value by locator on opened page ${agreement_changes_1_modifications_0_factor_value_locator} ${agreement_changes_1_modifications_0_factor_value_type} |
| 1303 | ... ELSE Run Keyword If '${field_name}' == 'changes[1].status' get value by locator on opened page ${agreement_changes_1_status_value_locator} | 1303 | ... ELSE Run Keyword If '${field_name}' == 'changes[1].status' get value by locator on opened page ${agreement_changes_1_status_value_locator} |
| 1304 | - ... ELSE Run Keyword If '${field_name}' == 'changes[2].rationaleType' get value by locator on opened page ${agreement_changes_2_rationaleType_value_locator} | 1304 | +# ... ELSE Run Keyword If '${field_name}' == 'changes[2].rationaleType' get value by locator on opened page ${agreement_changes_2_rationaleType_value_locator} |
| 1305 | ... ELSE Run Keyword If '${field_name}' == 'changes[2].rationale' get value by locator on opened page ${agreement_changes_2_rationale_value_locator} | 1305 | ... ELSE Run Keyword If '${field_name}' == 'changes[2].rationale' get value by locator on opened page ${agreement_changes_2_rationale_value_locator} |
| 1306 | ... ELSE Run Keyword If '${field_name}' == 'changes[2].modifications[0].itemId' get value by locator on opened page ${agreement_changes_2_modifications_0_itemId_value_locator} | 1306 | ... ELSE Run Keyword If '${field_name}' == 'changes[2].modifications[0].itemId' get value by locator on opened page ${agreement_changes_2_modifications_0_itemId_value_locator} |
| 1307 | ... ELSE Run Keyword If '${field_name}' == 'changes[2].modifications[0].factor' get value by locator on opened page ${agreement_changes_2_modifications_0_factor_value_locator} ${agreement_changes_2_modifications_0_factor_value_type} | 1307 | ... ELSE Run Keyword If '${field_name}' == 'changes[2].modifications[0].factor' get value by locator on opened page ${agreement_changes_2_modifications_0_factor_value_locator} ${agreement_changes_2_modifications_0_factor_value_type} |
| 1308 | ... ELSE Run Keyword If '${field_name}' == 'changes[2].status' get value by locator on opened page ${agreement_changes_2_status_value_locator} | 1308 | ... ELSE Run Keyword If '${field_name}' == 'changes[2].status' get value by locator on opened page ${agreement_changes_2_status_value_locator} |
| 1309 | - ... ELSE Run Keyword If '${field_name}' == 'changes[3].rationaleType' get value by locator on opened page ${agreement_changes_3_rationaleType_value_locator} | 1309 | +# ... ELSE Run Keyword If '${field_name}' == 'changes[3].rationaleType' get value by locator on opened page ${agreement_changes_3_rationaleType_value_locator} |
| 1310 | ... ELSE Run Keyword If '${field_name}' == 'changes[3].rationale' get value by locator on opened page ${agreement_changes_3_rationale_value_locator} | 1310 | ... ELSE Run Keyword If '${field_name}' == 'changes[3].rationale' get value by locator on opened page ${agreement_changes_3_rationale_value_locator} |
| 1311 | ... ELSE Run Keyword If '${field_name}' == 'changes[3].modifications[0].itemId' get value by locator on opened page ${agreement_changes_3_modifications_0_itemId_value_locator} | 1311 | ... ELSE Run Keyword If '${field_name}' == 'changes[3].modifications[0].itemId' get value by locator on opened page ${agreement_changes_3_modifications_0_itemId_value_locator} |
| 1312 | ... ELSE Run Keyword If '${field_name}' == 'changes[3].modifications[0].factor' get value by locator on opened page ${agreement_changes_3_modifications_0_factor_value_locator} ${agreement_changes_3_modifications_0_factor_value_type} | 1312 | ... ELSE Run Keyword If '${field_name}' == 'changes[3].modifications[0].factor' get value by locator on opened page ${agreement_changes_3_modifications_0_factor_value_locator} ${agreement_changes_3_modifications_0_factor_value_type} |
| @@ -20,6 +20,7 @@ ${agreement_changes_0_modifications_0_itemId_value_locator} = jquery=.tabs | @@ -20,6 +20,7 @@ ${agreement_changes_0_modifications_0_itemId_value_locator} = jquery=.tabs | ||
| 20 | ${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 | 20 | ${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 |
| 21 | ${agreement_changes_0_modifications_0_factor_value_type} = float | 21 | ${agreement_changes_0_modifications_0_factor_value_type} = float |
| 22 | ${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-addend.hidden | 22 | ${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-addend.hidden |
| 23 | +${agreement_changes_0_modifications_0_addend_value_type} = float | ||
| 23 | 24 | ||
| 24 | ${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 | 25 | ${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 |
| 25 | ${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 | 26 | ${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 |
| @@ -68,17 +68,26 @@ edit unitprices | @@ -68,17 +68,26 @@ edit unitprices | ||
| 68 | ... використовуючи значення з ${contract_data}. | 68 | ... використовуючи значення з ${contract_data}. |
| 69 | 69 | ||
| 70 | # Run Keyword If '${TEST_NAME}' == 'Можливість встановити ціну за одиницю для першого контракту' open popup by btn locator ${contract_active_form_agreement_open_btn_locator} | 70 | # Run Keyword If '${TEST_NAME}' == 'Можливість встановити ціну за одиницю для першого контракту' open popup by btn locator ${contract_active_form_agreement_open_btn_locator} |
| 71 | - Run Keyword If '${TEST_NAME}' == 'Можливість встановити ціну за одиницю для другого контракту' click visible element ${contract_next_form_agreement_open_btn_locator} | 71 | + Run Keyword If '${TEST_NAME}' == 'Можливість встановити ціну за одиницю для другого контракту' Execute Javascript $('#agreement-contracts-list .tabs__item.tabs__item--active_next-child a[id*="tab-agreement-contract"] span span').click() |
| 72 | # Run Keyword If '${TEST_NAME}' == 'Можливість встановити ціну за одиницю для другого контракту' open popup by btn locator ${contract_active_form_agreement_open_btn_locator} | 72 | # Run Keyword If '${TEST_NAME}' == 'Можливість встановити ціну за одиницю для другого контракту' open popup by btn locator ${contract_active_form_agreement_open_btn_locator} |
| 73 | - Run Keyword If '${TEST_NAME}' == 'Можливість встановити ціну за одиницю для третього контракту' click visible element ${contract_next_form_agreement_open_btn_locator} | 73 | + capture page screenshot |
| 74 | + Run Keyword If '${TEST_NAME}' == 'Можливість встановити ціну за одиницю для третього контракту' Execute Javascript ${contract_next_form_agreement1_open_btn_locator} | ||
| 75 | + capture page screenshot | ||
| 74 | open popup by btn locator ${contract_active_form_agreement_open_btn_locator} | 76 | open popup by btn locator ${contract_active_form_agreement_open_btn_locator} |
| 75 | - input number to exist visible input ${contract_agreement_unit_prices_input_locator} ${contract_data.data.unitPrices.value.amount} | 77 | + capture page screenshot |
| 78 | +# Run Keyword If '${TEST_NAME}' == 'Можливість встановити ціну за одиницю для першого контракту' input number to exist visible input ${contract_agreement_unit_prices_input_locator} ${contract_data.data.unitPrices[0].value.amount} | ||
| 79 | +# capture page screenshot | ||
| 80 | +# Run Keyword If '${TEST_NAME}' == 'Можливість встановити ціну за одиницю для другого контракту' input number to exist visible input ${contract_agreement_unit_prices_input_locator} ${contract_data.data.unitPrices[1].value.amount} | ||
| 81 | +# capture page screenshot | ||
| 82 | +# Run Keyword If '${TEST_NAME}' == 'Можливість встановити ціну за одиницю для третього контракту' input number to exist visible input ${contract_agreement_unit_prices_input_locator} ${contract_data.data.unitPrices[2].value.amount} | ||
| 83 | +# capture page screenshot | ||
| 84 | + input number to exist visible input ${contract_agreement_unit_prices_input_locator} ${contract_data.data.unitPrices[0].value.amount} | ||
| 76 | 85 | ||
| 77 | submit form and check result ${contract_contractform_submit_btn_locator} ${contract_agreement_active_submit_success_msg} | 86 | submit form and check result ${contract_contractform_submit_btn_locator} ${contract_agreement_active_submit_success_msg} |
| 78 | capture page screenshot | 87 | capture page screenshot |
| 79 | 88 | ||
| 80 | active agreement contract | 89 | active agreement contract |
| 81 | - [Arguments] ${startDate} ${endDate} | 90 | + [Arguments] ${period} |
| 82 | [Documentation] Зареєструвати угоду для користувача username для тендера tender_uaid, | 91 | [Documentation] Зареєструвати угоду для користувача username для тендера tender_uaid, |
| 83 | ... для поля Початок строку, на який укладається угода задати значення startDate, для Кінець строку, на який укладається угода - endDate. | 92 | ... для поля Початок строку, на який укладається угода задати значення startDate, для Кінець строку, на який укладається угода - endDate. |
| 84 | 93 |
| @@ -24,8 +24,10 @@ ${contract_contractform_add_document_close_description_btn_locator} = jquery=.j | @@ -24,8 +24,10 @@ ${contract_contractform_add_document_close_description_btn_locator} = jquery=.j | ||
| 24 | 24 | ||
| 25 | ${contract_active_form_open_btn_locator} = jquery=#contracts-pjax a[href*="/tender/contract-activate"] | 25 | ${contract_active_form_open_btn_locator} = jquery=#contracts-pjax a[href*="/tender/contract-activate"] |
| 26 | ${contract_active_form_agreement_open_btn_locator} = jquery=#agreement-contracts-list .tabs__pane.tabs__pane--visible a[href*="/tender/agreement-contract?"] | 26 | ${contract_active_form_agreement_open_btn_locator} = jquery=#agreement-contracts-list .tabs__pane.tabs__pane--visible a[href*="/tender/agreement-contract?"] |
| 27 | -${contract_next_form_agreement_open_btn_locator} = jquery=#agreement-contracts-list .tabs__item.tabs__item--active_next-child a[id*="tab-agreement-contract"] | ||
| 28 | -${contract_agreement_unit_prices_input_locator} = jquery=.fancybox-is-open input[id$="agreementcontractform-unit_prices"] | 27 | +${contract_next_form_agreement_open_btn_locator} = jquery=#agreement-contracts-list .tabs__item.tabs__item--active_next-child a[id*="tab-agreement-contract"] span span |
| 28 | +#${contract_next_form_agreement1_open_btn_locator} = jquery=#agreement-contracts-list .tabs__item.tabs__item--active_next-child a span span | ||
| 29 | +${contract_next_form_agreement1_open_btn_locator} = $('#agreement-contracts-list .tabs__item.tabs__item--active_next-child a span span').click() | ||
| 30 | +${contract_agreement_unit_prices_input_locator} = jquery=.fancybox-is-open input[id*="agreementcontractform-unit_prices"] | ||
| 29 | ${contract_agreement_active_submit_success_msg} = Постачальник успішно підтверджений, триває синхронізація з сайтом уповноваженого органу. | 31 | ${contract_agreement_active_submit_success_msg} = Постачальник успішно підтверджений, триває синхронізація з сайтом уповноваженого органу. |
| 30 | ${contract_active_agreement_form_open_btn_locator} = jquery=.aside__inner a[href*="/tender/agreement?"] | 32 | ${contract_active_agreement_form_open_btn_locator} = jquery=.aside__inner a[href*="/tender/agreement?"] |
| 31 | ${contract_agreement_agreement_number_input_locator} = jquery=#agreementform-agreement_number | 33 | ${contract_agreement_agreement_number_input_locator} = jquery=#agreementform-agreement_number |
| @@ -532,6 +532,7 @@ Wait For QualificationsPeriodEnd | @@ -532,6 +532,7 @@ Wait For QualificationsPeriodEnd | ||
| 532 | Отримати інформацію із contracts[1].dateSigned | 532 | Отримати інформацію із contracts[1].dateSigned |
| 533 | [Documentation] Отримати значення поля contracts[1].dateSigned | 533 | [Documentation] Отримати значення поля contracts[1].dateSigned |
| 534 | 534 | ||
| 535 | + submit form and check result ${bid_form_refresh_btn_locator} ${bid_form_refresh_success_msg} ${tender_created_checker_element_locator} ${true} | ||
| 535 | ${return_value} = get value by locator on opened page ${tender_contracts_1_dateSigned_value_locator} | 536 | ${return_value} = get value by locator on opened page ${tender_contracts_1_dateSigned_value_locator} |
| 536 | [return] ${return_value} | 537 | [return] ${return_value} |
| 537 | 538 | ||
| @@ -658,9 +659,13 @@ Wait date | @@ -658,9 +659,13 @@ Wait date | ||
| 658 | [Arguments] ${field_name} | 659 | [Arguments] ${field_name} |
| 659 | [Documentation] Отримати значення поля rationaleType | 660 | [Documentation] Отримати значення поля rationaleType |
| 660 | 661 | ||
| 661 | - ${return_value} = Run Keyword If "${field_name}" == "Зміна ціни за одиницю товару" Set Variable itemPriceVariation | ||
| 662 | - ... ELSE IF "${field_name}" == "Зміна ціни у зв’язку із зміною ставок податків і зборів" Set Variable taxRate | ||
| 663 | - ... ELSE IF "${field_name}" == "Зміна сторонніх показників (курсу, тарифів...)" Set Variable thirdParty | ||
| 664 | - ... ELSE IF "${field_name}" == "Припинення участі у рамковій угоді учасника" Set Variable partyWithdrawal | 662 | + ${return_value} = Run Keyword If "${field_name}" == "changes[0].rationaleType" Set Variable itemPriceVariation |
| 663 | + ... ELSE IF "${field_name}" == "changes[1].rationaleType" Set Variable taxRate | ||
| 664 | + ... ELSE IF "${field_name}" == "changes[2].rationaleType" Set Variable thirdParty | ||
| 665 | + ... ELSE IF "${field_name}" == "changes[3].rationaleType" Set Variable partyWithdrawal | ||
| 666 | +# ${return_value} = Run Keyword If "${field_name}" == "Зміна ціни за одиницю товару" Set Variable itemPriceVariation | ||
| 667 | +# ... ELSE IF "${field_name}" == "Зміна ціни у зв’язку із зміною ставок податків і зборів" Set Variable taxRate | ||
| 668 | +# ... ELSE IF "${field_name}" == "Зміна сторонніх показників (курсу, тарифів...)" Set Variable thirdParty | ||
| 669 | +# ... ELSE IF "${field_name}" == "Припинення участі у рамковій угоді учасника" Set Variable partyWithdrawal | ||
| 665 | [return] ${return_value} | 670 | [return] ${return_value} |
| 666 | 671 |
Please
register
or
login
to post a comment