Commit ac3425d5f5454fc1fc9d6ab29ad80e8b51247103
1 parent
670cdda4
adjusted v3-dev branch for publicbid
Showing
24 changed files
with
51 additions
and
51 deletions
| @@ -2,10 +2,10 @@ robot_tests.broker.template | @@ -2,10 +2,10 @@ robot_tests.broker.template | ||
| 2 | =========================== | 2 | =========================== |
| 3 | 3 | ||
| 4 | |Join the chat at | 4 | |Join the chat at |
| 5 | -https://gitter.im/ProzorroUKR/robot_tests.broker.playtender| | 5 | +https://gitter.im/ProzorroUKR/robot_tests.broker.publicbid| |
| 6 | 6 | ||
| 7 | This repository is a part of OpenProcurement `Robot | 7 | This repository is a part of OpenProcurement `Robot |
| 8 | tests <https://github.com/ProzorroUKR/robot_tests>`__ package. | 8 | tests <https://github.com/ProzorroUKR/robot_tests>`__ package. |
| 9 | 9 | ||
| 10 | -.. |Join the chat at https://gitter.im/ProzorroUKR/robot_tests.broker.playtender| image:: https://badges.gitter.im/ProzorroUKR/robot_tests.broker.playtender.svg | ||
| 11 | - :target: https://gitter.im/ProzorroUKR/robot_tests.broker.playtender | 10 | +.. |Join the chat at https://gitter.im/ProzorroUKR/robot_tests.broker.publicbid| image:: https://badges.gitter.im/ProzorroUKR/robot_tests.broker.publicbid.svg |
| 11 | + :target: https://gitter.im/ProzorroUKR/robot_tests.broker.publicbid |
| 1 | *** Settings *** | 1 | *** Settings *** |
| 2 | 2 | ||
| 3 | -Resource playtender_common.robot | ||
| 4 | -Resource playtender_plan.robot | ||
| 5 | -Resource playtender_tender.robot | ||
| 6 | -Resource playtender_qualification.robot | ||
| 7 | -Resource playtender_contract.robot | ||
| 8 | -Resource playtender_agreement.robot | 3 | +Resource publicbid_common.robot |
| 4 | +Resource publicbid_plan.robot | ||
| 5 | +Resource publicbid_tender.robot | ||
| 6 | +Resource publicbid_qualification.robot | ||
| 7 | +Resource publicbid_contract.robot | ||
| 8 | +Resource publicbid_agreement.robot | ||
| 9 | 9 | ||
| 10 | *** Variables *** | 10 | *** Variables *** |
| 11 | 11 | ||
| @@ -125,7 +125,7 @@ Resource playtender_agree | @@ -125,7 +125,7 @@ Resource playtender_agree | ||
| 125 | [Documentation] Створити тендер з початковими даними tender_data. Повернути | 125 | [Documentation] Створити тендер з початковими даними tender_data. Повернути |
| 126 | ... uaid створеного тендера. | 126 | ... uaid створеного тендера. |
| 127 | 127 | ||
| 128 | - playtender.Створити тендер ${user} ${tender_data} ${tender_aid} | 128 | + publicbid.Створити тендер ${user} ${tender_data} ${tender_aid} |
| 129 | ${tender_uaid} = get text ${tender_uaid_text_locator} | 129 | ${tender_uaid} = get text ${tender_uaid_text_locator} |
| 130 | [Return] ${tender_uaid} | 130 | [Return] ${tender_uaid} |
| 131 | 131 | ||
| @@ -145,8 +145,8 @@ Resource playtender_agree | @@ -145,8 +145,8 @@ Resource playtender_agree | ||
| 145 | ${tender_data_keys}= Get Dictionary Keys ${tender_data.data} | 145 | ${tender_data_keys}= Get Dictionary Keys ${tender_data.data} |
| 146 | log many ${SUITE_NAME} | 146 | log many ${SUITE_NAME} |
| 147 | ${procurementMethodType} = Set Variable If 'procurementMethodType' in ${tender_data_keys} ${tender_data.data.procurementMethodType} belowThreshold | 147 | ${procurementMethodType} = Set Variable If 'procurementMethodType' in ${tender_data_keys} ${tender_data.data.procurementMethodType} belowThreshold |
| 148 | - Run Keyword If '${SUITE_NAME}' == 'Tests Files.Complaints' and '${procurementMethodType}' == 'aboveThresholdUA' Go To ${BROKERS['playtender'].basepage}/utils/config?tacceleration=1000 | ||
| 149 | - Run Keyword If '${SUITE_NAME}' == 'Tests Files.Complaints' and '${procurementMethodType}' == 'belowThreshold' Go To ${BROKERS['playtender'].basepage}/utils/config?tacceleration=720 | 148 | + Run Keyword If '${SUITE_NAME}' == 'Tests Files.Complaints' and '${procurementMethodType}' == 'aboveThresholdUA' Go To ${BROKERS['publicbid'].basepage}/utils/config?tacceleration=1000 |
| 149 | + Run Keyword If '${SUITE_NAME}' == 'Tests Files.Complaints' and '${procurementMethodType}' == 'belowThreshold' Go To ${BROKERS['publicbid'].basepage}/utils/config?tacceleration=720 | ||
| 150 | open new tender form | 150 | open new tender form |
| 151 | fill tender form ${tender_prepared_data} | 151 | fill tender form ${tender_prepared_data} |
| 152 | submit form and check result ${tender_form_submit_btn_locator} ${tender_form_submit_success_msg} ${tender_created_checker_element_locator} ${true} | 152 | submit form and check result ${tender_form_submit_btn_locator} ${tender_form_submit_success_msg} ${tender_created_checker_element_locator} ${true} |
| 1 | *** Settings *** | 1 | *** Settings *** |
| 2 | 2 | ||
| 3 | -Resource playtender_common.robot | ||
| 4 | -Resource playtender_agreement_variables.robot | ||
| 5 | -Resource playtender_question.robot | ||
| 6 | -Resource playtender_claim.robot | ||
| 7 | -Resource playtender_bid.robot | ||
| 8 | -Resource playtender_viewer.robot | 3 | +Resource publicbid_common.robot |
| 4 | +Resource publicbid_agreement_variables.robot | ||
| 5 | +Resource publicbid_question.robot | ||
| 6 | +Resource publicbid_claim.robot | ||
| 7 | +Resource publicbid_bid.robot | ||
| 8 | +Resource publicbid_viewer.robot | ||
| 9 | 9 | ||
| 10 | *** Keywords *** | 10 | *** Keywords *** |
| 11 | 11 |
| 1 | *** Settings *** | 1 | *** Settings *** |
| 2 | 2 | ||
| 3 | -Resource playtender_common.robot | ||
| 4 | -Resource playtender_variables.robot | ||
| 5 | -Resource playtender_bid_variables.robot | 3 | +Resource publicbid_common.robot |
| 4 | +Resource publicbid_variables.robot | ||
| 5 | +Resource publicbid_bid_variables.robot | ||
| 6 | 6 | ||
| 7 | *** Keywords *** | 7 | *** Keywords *** |
| 8 | 8 | ||
| @@ -234,7 +234,7 @@ get bid information | @@ -234,7 +234,7 @@ get bid information | ||
| 234 | ## ... ELSE Run Keyword If 'status' == '${field}' get value by locator on opened page ${bid_form_bid_status_btn_locator} | 234 | ## ... ELSE Run Keyword If 'status' == '${field}' get value by locator on opened page ${bid_form_bid_status_btn_locator} |
| 235 | ## ... ELSE Run Keyword If 'value.amount' == '${field}' get value by locator on opened page ${bid_form_value_amount_input_locator} | 235 | ## ... ELSE Run Keyword If 'value.amount' == '${field}' get value by locator on opened page ${bid_form_value_amount_input_locator} |
| 236 | # submit current visible popup | 236 | # submit current visible popup |
| 237 | -## ${return_value} = Run Keyword If 'lotValues[0].value.amount' == '${field}' or 'value.amount' == '${field}' playtender_service.split_joinvalue ${return_value} | 237 | +## ${return_value} = Run Keyword If 'lotValues[0].value.amount' == '${field}' or 'value.amount' == '${field}' publicbid_service.split_joinvalue ${return_value} |
| 238 | ## ${return_value} = Run Keyword If 'lotValues[0].value.amount' == '${field}' or 'value.amount' == '${field}' Convert To Number ${return_value} | 238 | ## ${return_value} = Run Keyword If 'lotValues[0].value.amount' == '${field}' or 'value.amount' == '${field}' Convert To Number ${return_value} |
| 239 | [Return] ${return_value} | 239 | [Return] ${return_value} |
| 240 | 240 | ||
| @@ -251,7 +251,7 @@ get bid value | @@ -251,7 +251,7 @@ get bid value | ||
| 251 | ... username для тендера tender_uaid. | 251 | ... username для тендера tender_uaid. |
| 252 | 252 | ||
| 253 | ${return_value} = get value by locator on opened page ${field} | 253 | ${return_value} = get value by locator on opened page ${field} |
| 254 | - ${return_value} = playtender_service.split_joinvalue ${return_value} | 254 | + ${return_value} = publicbid_service.split_joinvalue ${return_value} |
| 255 | ${return_value} = Convert To Number ${return_value} | 255 | ${return_value} = Convert To Number ${return_value} |
| 256 | [Return] ${return_value} | 256 | [Return] ${return_value} |
| 257 | 257 |
| @@ -3,12 +3,12 @@ | @@ -3,12 +3,12 @@ | ||
| 3 | Library Selenium2Library | 3 | Library Selenium2Library |
| 4 | Library String | 4 | Library String |
| 5 | Library Collections | 5 | Library Collections |
| 6 | -Library playtender_service.py | ||
| 7 | -Resource playtender_variables.robot | 6 | +Library publicbid_service.py |
| 7 | +Resource publicbid_variables.robot | ||
| 8 | 8 | ||
| 9 | *** Variables *** | 9 | *** Variables *** |
| 10 | 10 | ||
| 11 | -${broker} = playtender | 11 | +${broker} = publicbid |
| 12 | ${broker_username} = | 12 | ${broker_username} = |
| 13 | ${broker_baseurl} = | 13 | ${broker_baseurl} = |
| 14 | ${broker_browser} = | 14 | ${broker_browser} = |
| 1 | *** Settings *** | 1 | *** Settings *** |
| 2 | 2 | ||
| 3 | -Resource playtender_common.robot | ||
| 4 | -Resource playtender_variables.robot | ||
| 5 | -Resource playtender_contract_variables.robot | ||
| 6 | -Resource playtender_qualification_variables.robot | 3 | +Resource publicbid_common.robot |
| 4 | +Resource publicbid_variables.robot | ||
| 5 | +Resource publicbid_contract_variables.robot | ||
| 6 | +Resource publicbid_qualification_variables.robot | ||
| 7 | 7 | ||
| 8 | *** Keywords *** | 8 | *** Keywords *** |
| 9 | 9 |
| 1 | *** Settings *** | 1 | *** Settings *** |
| 2 | 2 | ||
| 3 | -Resource playtender_common.robot | ||
| 4 | -Resource playtender_variables.robot | ||
| 5 | -Resource playtender_bid_variables.robot | ||
| 6 | -Resource playtender_qualification_variables.robot | 3 | +Resource publicbid_common.robot |
| 4 | +Resource publicbid_variables.robot | ||
| 5 | +Resource publicbid_bid_variables.robot | ||
| 6 | +Resource publicbid_qualification_variables.robot | ||
| 7 | 7 | ||
| 8 | *** Keywords *** | 8 | *** Keywords *** |
| 9 | 9 | ||
| @@ -106,7 +106,7 @@ copy file qualification | @@ -106,7 +106,7 @@ copy file qualification | ||
| 106 | ... постачальника під номером award_num для тендера tender_uaid. | 106 | ... постачальника під номером award_num для тендера tender_uaid. |
| 107 | 107 | ||
| 108 | ## copy file to another dir to prevent it deleting | 108 | ## copy file to another dir to prevent it deleting |
| 109 | - ${new_doc_name} = Replace String ${document} /tmp/ /tmp/playtender/ | 109 | + ${new_doc_name} = Replace String ${document} /tmp/ /tmp/publicbid/ |
| 110 | Copy File ${document} ${new_doc_name} | 110 | Copy File ${document} ${new_doc_name} |
| 111 | Set To Dictionary ${USERS.users['${username}']} qproposal${award_num}_document=${new_doc_name} | 111 | Set To Dictionary ${USERS.users['${username}']} qproposal${award_num}_document=${new_doc_name} |
| 112 | 112 |
This diff could not be displayed because it is too large.
| 1 | *** Settings *** | 1 | *** Settings *** |
| 2 | 2 | ||
| 3 | -Resource playtender_common.robot | ||
| 4 | -Resource playtender_variables.robot | ||
| 5 | -Resource playtender_question.robot | ||
| 6 | -Resource playtender_claim.robot | ||
| 7 | -Resource playtender_bid.robot | ||
| 8 | -Resource playtender_viewer.robot | ||
| 9 | -Resource playtender_viewer_variables.robot | 3 | +Resource publicbid_common.robot |
| 4 | +Resource publicbid_variables.robot | ||
| 5 | +Resource publicbid_question.robot | ||
| 6 | +Resource publicbid_claim.robot | ||
| 7 | +Resource publicbid_bid.robot | ||
| 8 | +Resource publicbid_viewer.robot | ||
| 9 | +Resource publicbid_viewer_variables.robot | ||
| 10 | 10 | ||
| 11 | *** Keywords *** | 11 | *** Keywords *** |
| 12 | 12 |
| 1 | from setuptools import setup | 1 | from setuptools import setup |
| 2 | 2 | ||
| 3 | -broker_name = 'playtender' | 3 | +broker_name = 'publicbid' |
| 4 | pkg_name = 'robot_tests.broker.{}'.format(broker_name) | 4 | pkg_name = 'robot_tests.broker.{}'.format(broker_name) |
| 5 | description = '{} broker for OpenProcurement Robot tests'.format(broker_name) | 5 | description = '{} broker for OpenProcurement Robot tests'.format(broker_name) |
| 6 | 6 |
Please
register
or
login
to post a comment