From 3d1aa315bad633e63543980585a5dad5b2061ca0 Mon Sep 17 00:00:00 2001 From: OrysiaDrabych Date: Wed, 11 Oct 2017 20:35:01 +0300 Subject: [PATCH 1/4] Add new scenarios for insider --- .../dgf_insider_dutch_winner.txt | 30 ++++++++++++ .../dgf_insider_three_providers.txt | 48 +++++++++++++++++++ .../dgf_insider_without_bestbid.txt | 28 +++++++++++ 3 files changed, 106 insertions(+) create mode 100644 robot_tests_arguments/dgf_insider_dutch_winner.txt create mode 100644 robot_tests_arguments/dgf_insider_three_providers.txt create mode 100644 robot_tests_arguments/dgf_insider_without_bestbid.txt diff --git a/robot_tests_arguments/dgf_insider_dutch_winner.txt b/robot_tests_arguments/dgf_insider_dutch_winner.txt new file mode 100644 index 000000000..20c5d82ad --- /dev/null +++ b/robot_tests_arguments/dgf_insider_dutch_winner.txt @@ -0,0 +1,30 @@ +-v MODE:dgfInsider + +-v NUMBER_OF_ITEMS:3 + +-i create_tender +-i find_tender +-i tender_view +-i tender_view_tenderPeriod +-i tender_view_tenderPeriod_startDate +-i tender_view_auctionPeriod_StartDate +-i tender_view_unit_code + + +-i make_bid_by_provider +-i add_financial_license_to_bid_by_provider +-i auction_url_provider + + +-i auction + +-i awarding +-i change_first_award_payment_status +-i add_protocol_to_first_award +-i approve_first_award_protocol +-i first_award_payment_status +-i confirm_first_award +-i first_award_active_status + +-i contract_sign +-i contract_sign_upload \ No newline at end of file diff --git a/robot_tests_arguments/dgf_insider_three_providers.txt b/robot_tests_arguments/dgf_insider_three_providers.txt new file mode 100644 index 000000000..43479629f --- /dev/null +++ b/robot_tests_arguments/dgf_insider_three_providers.txt @@ -0,0 +1,48 @@ +-v MODE:dgfInsider + +-v NUMBER_OF_ITEMS:3 + +-i create_tender +-i find_tender +-i tender_view +-i tender_view_tenderPeriod +-i tender_view_tenderPeriod_startDate +-i tender_view_auctionPeriod_StartDate +-i tender_view_unit_code + + +-i make_bid_by_provider +-i add_financial_license_to_bid_by_provider +-i auction_url_provider + + +-i auction +-i make_bid_by_provider1_before_dutch +-i make_bid_by_provider2_after_dutch +-i make_bid_by_provider1_during_sealedbid +-i make_bid_by_provider2_during_sealedbid +-i wait_for_bestbid +-i make_bid_by_dutch_winner + + +-i awarding +-i first_award_verification_status +-i second_award_waiting_status +-i change_first_award_payment_status +-i add_protocol_to_first_award +-i approve_first_award_protocol +-i first_award_payment_status +-i confirm_first_award +-i first_award_active_status +-i disqualified_first_active_award +-i first_award_status_unsuccessful +-i second_award_verification_status +-i change_second_award_payment_status +-i add_protocol_to_second_award +-i approve_second_award_protocol +-i confirm_second_award +-i second_award_active_status + + +-i contract_sign +-i contract_sign_upload \ No newline at end of file diff --git a/robot_tests_arguments/dgf_insider_without_bestbid.txt b/robot_tests_arguments/dgf_insider_without_bestbid.txt new file mode 100644 index 000000000..a656a8874 --- /dev/null +++ b/robot_tests_arguments/dgf_insider_without_bestbid.txt @@ -0,0 +1,28 @@ +-v MODE:dgfInsider + +-v NUMBER_OF_ITEMS:3 + +-i create_tender +-i find_tender +-i tender_view +-i tender_view_tenderPeriod +-i tender_view_tenderPeriod_startDate +-i tender_view_auctionPeriod_StartDate +-i tender_view_unit_code + + +-i make_bid_by_provider +-i add_financial_license_to_bid_by_provider +-i auction_url_provider + + +-i auction +-i make_bid_by_provider1_after_dutch +-i make_bid_by_provider1_during_sealedbid +-i wait_for_bestbid + + +-i awarding +-i disqualified_first_award +-i disqualified_second_award +-i tender_status_unsuccessful From dff68435f16abd56e63eb425fbb052a1069ef6fd Mon Sep 17 00:00:00 2001 From: OrysiaDrabych Date: Wed, 11 Oct 2017 20:36:09 +0300 Subject: [PATCH 2/4] Edit tags in scenarios --- robot_tests_arguments/dgf_insider_dutch_winner.txt | 3 +-- robot_tests_arguments/dgf_insider_full_auction.txt | 1 + robot_tests_arguments/dgf_insider_three_providers.txt | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/robot_tests_arguments/dgf_insider_dutch_winner.txt b/robot_tests_arguments/dgf_insider_dutch_winner.txt index 20c5d82ad..6f68390d9 100644 --- a/robot_tests_arguments/dgf_insider_dutch_winner.txt +++ b/robot_tests_arguments/dgf_insider_dutch_winner.txt @@ -26,5 +26,4 @@ -i confirm_first_award -i first_award_active_status --i contract_sign --i contract_sign_upload \ No newline at end of file +-i contract_sign \ No newline at end of file diff --git a/robot_tests_arguments/dgf_insider_full_auction.txt b/robot_tests_arguments/dgf_insider_full_auction.txt index be1a4b938..d76bd1ced 100644 --- a/robot_tests_arguments/dgf_insider_full_auction.txt +++ b/robot_tests_arguments/dgf_insider_full_auction.txt @@ -17,6 +17,7 @@ -i auction -i make_bid_by_provider1_after_dutch -i make_bid_by_provider1_during_sealedbid +-i wait_for_bestbid -i make_bid_by_dutch_winner -i auction_end diff --git a/robot_tests_arguments/dgf_insider_three_providers.txt b/robot_tests_arguments/dgf_insider_three_providers.txt index 43479629f..d901abd8a 100644 --- a/robot_tests_arguments/dgf_insider_three_providers.txt +++ b/robot_tests_arguments/dgf_insider_three_providers.txt @@ -34,7 +34,7 @@ -i first_award_payment_status -i confirm_first_award -i first_award_active_status --i disqualified_first_active_award +-i disqualified_first_award -i first_award_status_unsuccessful -i second_award_verification_status -i change_second_award_payment_status @@ -44,5 +44,4 @@ -i second_award_active_status --i contract_sign --i contract_sign_upload \ No newline at end of file +-i contract_sign \ No newline at end of file From 25fd29306531548424b871a1b9272542d86b731a Mon Sep 17 00:00:00 2001 From: OrysiaDrabych Date: Wed, 11 Oct 2017 20:40:45 +0300 Subject: [PATCH 3/4] Add provider3 role --- .../tests_files/base_keywords.robot | 2 +- op_robot_tests/tests_files/insider_full.robot | 49 ++++++++++++++++--- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/op_robot_tests/tests_files/base_keywords.robot b/op_robot_tests/tests_files/base_keywords.robot index 1e1f75d85..4bc4e3ad3 100644 --- a/op_robot_tests/tests_files/base_keywords.robot +++ b/op_robot_tests/tests_files/base_keywords.robot @@ -189,7 +189,7 @@ Resource resource.robot Отримати дані із поля ${field} тендера для усіх користувачів - :FOR ${username} IN ${viewer} ${provider} ${provider1} ${tender_owner} + :FOR ${username} IN ${viewer} ${provider} ${provider1} ${provider2} ${tender_owner} \ Отримати дані із поля ${field} тендера для користувача ${username} diff --git a/op_robot_tests/tests_files/insider_full.robot b/op_robot_tests/tests_files/insider_full.robot index 6b5e56083..0491a9d57 100644 --- a/op_robot_tests/tests_files/insider_full.robot +++ b/op_robot_tests/tests_files/insider_full.robot @@ -85,7 +85,7 @@ ${sealedbid_amount} xpath=(//div[contains(concat(' ', normalize-space(@class), [Tags] ${USERS.users['${provider1}'].broker}: Подання пропозиції ... provider1 ... ${USERS.users['${provider1}'].broker} - ... make_bid_by_provider1_before_dutch level1 + ... make_bid_by_provider1_before_dutch [Teardown] Оновити LAST_MODIFICATION_DATE Можливість подати цінову пропозицію користувачем ${provider1} @@ -146,16 +146,41 @@ ${sealedbid_amount} xpath=(//div[contains(concat(' ', normalize-space(@class), Відкрити сторінку аукціону для ${provider1} +Можливість подати пропозицію третім учасником + [Tags] ${USERS.users['${provider2}'].broker}: Подання пропозиції + ... provider2 + ... ${USERS.users['${provider2}'].broker} + ... make_bid_by_provider2_after_dutch + [Teardown] Оновити LAST_MODIFICATION_DATE + Можливість подати цінову пропозицію користувачем ${provider2} + + +Можливість завантажити фінансову ліцензію до пропозиції третім учасником + [Tags] ${USERS.users['${provider2}'].broker}: Подання пропозиції + ... provider2 + ... ${USERS.users['${provider2}'].broker} + ... make_bid_by_provider2_after_dutch + [Setup] Дочекатись синхронізації з майданчиком ${provider2} + [Teardown] Оновити LAST_MODIFICATION_DATE + Можливість завантажити фінансову ліцензію в пропозицію користувачем ${provider2} + + +Можливість долучитись до аукціону третім учасником після визначення переможця голландської частини + [Tags] ${USERS.users['${provider2}'].broker}: Процес аукціону + ... provider2 + ... ${USERS.users['${provider2}'].broker} + ... make_bid_by_provider2_after_dutch + Можливість вичитати посилання на аукціон для ${provider2} + Відкрити сторінку аукціону для ${provider2} + + Можливість дочекатись Sealed Bid частини аукціону [Tags] ${USERS.users['${viewer}'].broker}: Процес аукціону - ... viewer provider provider1 + ... viewer ... ${USERS.users['${viewer}'].broker} - ... ${USERS.users['${provider}'].broker} - ... ${USERS.users['${provider1}'].broker} ... auction [Teardown] Оновити LAST_MODIFICATION_DATE - Дочекатись дати закінчення прийому пропозицій ${provider1} ${TENDER['TENDER_UAID']} - Дочекатись завершення паузи перед Sealed Bid етапом + Дочекатись дати закінчення прийому пропозицій ${viewer} ${TENDER['TENDER_UAID']} Можливість зробити ставку другим учасником @@ -163,10 +188,20 @@ ${sealedbid_amount} xpath=(//div[contains(concat(' ', normalize-space(@class), ... provider1 ... ${USERS.users['${provider1}'].broker} ... make_bid_by_provider1_during_sealedbid + Дочекатись завершення паузи перед Sealed Bid етапом Переключитись на учасника ${provider1} Подати більшу ставку, ніж переможець голландської частини +Можливість зробити ставку третім учасником + [Tags] ${USERS.users['${provider2}'].broker}: Процес аукціону + ... provider2 + ... ${USERS.users['${provider2}'].broker} + ... make_bid_by_provider2_during_sealedbid + Переключитись на учасника ${provider2} + Подати більшу ставку, ніж переможець голландської частини + + Можливість відмінити ставку другим учасником [Tags] ${USERS.users['${provider1}'].broker}: Процес аукціону ... provider1 @@ -190,7 +225,7 @@ ${sealedbid_amount} xpath=(//div[contains(concat(' ', normalize-space(@class), ... ${USERS.users['${viewer}'].broker} ... ${USERS.users['${provider}'].broker} ... ${USERS.users['${provider1}'].broker} - ... make_bid_by_dutch_winner + ... wait_for_bestbid Дочекатись паузи перед Best Bid етапом Дочекатись завершення паузи перед Best Bid етапом From c6276d0146b7dab37d5b870fbf114243073e5a84 Mon Sep 17 00:00:00 2001 From: OrysiaDrabych Date: Fri, 20 Oct 2017 20:19:18 +0300 Subject: [PATCH 4/4] Upload contract document and sign contract in one test case --- .../brokers/openprocurement_client.robot | 20 ++++++++----------- .../tests_files/contract_signing.robot | 13 +----------- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/op_robot_tests/tests_files/brokers/openprocurement_client.robot b/op_robot_tests/tests_files/brokers/openprocurement_client.robot index dd86114f4..49ab5d6c4 100644 --- a/op_robot_tests/tests_files/brokers/openprocurement_client.robot +++ b/op_robot_tests/tests_files/brokers/openprocurement_client.robot @@ -638,21 +638,13 @@ Library openprocurement_client.utils [return] ${filename} -Підтвердити підписання контракту +Завантажити угоду та підтвердити підписання контракту [Documentation] ... [Arguments] Username, tender uaid, contract number - ... Find tender using uaid, get contract test_confirmation data and call patch_contract + ... Find tender using uaid, upload contract document, get contract test_confirmation data and call patch_contract ... [Return] Nothing [Arguments] ${username} ${tender_uaid} ${contract_num} - ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} - ${data}= test_confirm_data ${tender['data']['contracts'][${contract_num}]['id']} - Log ${data} - ${reply}= Call Method ${USERS.users['${username}'].client} patch_contract ${tender} ${data} - Log ${reply} - - -Завантажити угоду до тендера - [Arguments] ${username} ${tender_uaid} ${contract_num} ${filepath} + ${file_path} ${file_title} ${file_content}= create_fake_doc ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} ${contract_id}= Get Variable Value ${tender['data']['contracts'][${contract_num}]['id']} ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token} @@ -661,7 +653,11 @@ Library openprocurement_client.utils Set To Dictionary ${response['data']} documentType=contractSigned ${reply}= Call Method ${USERS.users['${username}'].client} patch_contract_document ${tender} ${response} ${contract_id} ${response['data'].id} Log ${reply} - [return] ${reply} + Remove File ${file_path} + ${data}= test_confirm_data ${contract_id} + Log ${data} + ${reply}= Call Method ${USERS.users['${username}'].client} patch_contract ${tender} ${data} + Log ${reply} ############################################################################## diff --git a/op_robot_tests/tests_files/contract_signing.robot b/op_robot_tests/tests_files/contract_signing.robot index 735c34003..bf1857ca4 100644 --- a/op_robot_tests/tests_files/contract_signing.robot +++ b/op_robot_tests/tests_files/contract_signing.robot @@ -22,24 +22,13 @@ Suite Teardown Test Suite Teardown # CONTRACT ############################################################################################## -Можливість завантажити угоду до лоту - [Tags] ${USERS.users['${tender_owner}'].broker}: Завантаження документів щодо угоди - ... tender_owner - ... ${USERS.users['${tender_owner}'].broker} - ... contract_sign_upload - [Teardown] Оновити LMD і дочекатись синхронізації ${tender_owner} - ${file_path} ${file_title} ${file_content}= create_fake_doc - Run As ${tender_owner} Завантажити угоду до тендера ${TENDER['TENDER_UAID']} -1 ${file_path} - Remove File ${file_path} - - Можливість укласти угоду для лоту [Tags] ${USERS.users['${tender_owner}'].broker}: Процес укладання угоди ... tender_owner ... ${USERS.users['${tender_owner}'].broker} ... contract_sign level1 [Teardown] Оновити LAST_MODIFICATION_DATE - Run As ${tender_owner} Підтвердити підписання контракту ${TENDER['TENDER_UAID']} -1 + Run As ${tender_owner} Завантажити угоду та підтвердити підписання контракту ${TENDER['TENDER_UAID']} -1 Відображення статусу підписаної угоди