diff --git a/op_robot_tests/tests_files/base_keywords.robot b/op_robot_tests/tests_files/base_keywords.robot index 393e6c4ad..26b10a8e2 100644 --- a/op_robot_tests/tests_files/base_keywords.robot +++ b/op_robot_tests/tests_files/base_keywords.robot @@ -628,7 +628,7 @@ Resource resource.robot ... Звірити статус вимоги/скарги ... ${provider} ... ${TENDER['TENDER_UAID']} - ... ${USERS.users['${provider}']['claim_data']['complaintID']} + ... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']} ... cancelled @@ -651,7 +651,7 @@ Resource resource.robot ... Звірити статус вимоги/скарги ... ${provider} ... ${TENDER['TENDER_UAID']} - ... ${USERS.users['${provider}']['claim_data']['complaintID']} + ... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']} ... cancelled @@ -677,7 +677,7 @@ Resource resource.robot ... Звірити статус вимоги/скарги ... ${provider} ... ${TENDER['TENDER_UAID']} - ... ${USERS.users['${provider}']['claim_data']['complaintID']} + ... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']} ... ${status} ... ${award_index} @@ -700,7 +700,7 @@ Resource resource.robot ... Звірити статус вимоги/скарги ... ${provider} ... ${TENDER['TENDER_UAID']} - ... ${USERS.users['${provider}']['claim_data']['complaintID']} + ... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']} ... pending @@ -722,7 +722,7 @@ Resource resource.robot ... Звірити статус вимоги/скарги ... ${provider} ... ${TENDER['TENDER_UAID']} - ... ${USERS.users['${provider}']['claim_data']['complaintID']} + ... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']} ... pending @@ -745,7 +745,7 @@ Resource resource.robot ... Звірити статус вимоги/скарги ... ${provider} ... ${TENDER['TENDER_UAID']} - ... ${USERS.users['${provider}']['claim_data']['complaintID']} + ... ${USERS.users['${provider}']['claim_data'][['claim']['data']['title']} ... pending ... ${award_index} @@ -756,7 +756,7 @@ Resource resource.robot ... ${TENDER['TENDER_UAID']} ... ${data} ... ${field} - ... ${USERS.users['${provider}'].claim_data['complaintID']} + ... ${USERS.users['${provider}'].claim_data['claim']['data']['title']} Звірити відображення поля ${field} вимоги про виправлення визначення ${award_index} переможця із ${data} для користувача ${username} @@ -765,7 +765,7 @@ Resource resource.robot ... ${TENDER['TENDER_UAID']} ... ${data} ... ${field} - ... ${USERS.users['${provider}'].claim_data['complaintID']} + ... ${USERS.users['${provider}'].claim_data['claim']['data']['title']} ... ${award_index} @@ -786,7 +786,7 @@ Resource resource.robot ... Звірити статус вимоги/скарги ... ${provider} ... ${TENDER['TENDER_UAID']} - ... ${USERS.users['${provider}']['claim_data']['complaintID']} + ... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']} ... answered @@ -807,7 +807,7 @@ Resource resource.robot ... Звірити статус вимоги/скарги ... ${provider} ... ${TENDER['TENDER_UAID']} - ... ${USERS.users['${provider}']['claim_data']['complaintID']} + ... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']} ... answered @@ -829,7 +829,7 @@ Resource resource.robot ... Звірити статус вимоги/скарги ... ${provider} ... ${TENDER['TENDER_UAID']} - ... ${USERS.users['${provider}']['claim_data']['complaintID']} + ... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']} ... answered ... ${award_index} @@ -852,7 +852,7 @@ Resource resource.robot ... Звірити статус вимоги/скарги ... ${provider} ... ${TENDER['TENDER_UAID']} - ... ${USERS.users['${provider}']['claim_data']['complaintID']} + ... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']} ... resolved @@ -874,7 +874,7 @@ Resource resource.robot ... Звірити статус вимоги/скарги ... ${provider} ... ${TENDER['TENDER_UAID']} - ... ${USERS.users['${provider}']['claim_data']['complaintID']} + ... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']} ... resolved @@ -897,7 +897,7 @@ Resource resource.robot ... Звірити статус вимоги/скарги ... ${provider} ... ${TENDER['TENDER_UAID']} - ... ${USERS.users['${provider}']['claim_data']['complaintID']} + ... ${USERS.users['${provider}']['claim_data']['claim']['data']['title']} ... resolved ... ${award_index} diff --git a/op_robot_tests/tests_files/brokers/openprocurement_client.robot b/op_robot_tests/tests_files/brokers/openprocurement_client.robot index 93ce368d6..66c4f8682 100644 --- a/op_robot_tests/tests_files/brokers/openprocurement_client.robot +++ b/op_robot_tests/tests_files/brokers/openprocurement_client.robot @@ -668,10 +668,10 @@ Library openprocurement_client_helper.py Отримати інформацію із скарги - [Arguments] ${username} ${tender_uaid} ${complaintID} ${field_name} ${award_index}=${None} + [Arguments] ${username} ${tender_uaid} ${complaintTitle} ${field_name} ${award_index}=${None} openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} ${complaints}= Get Variable Value ${USERS.users['${username}'].tender_data.data.awards[${award_index}].complaints} ${USERS.users['${username}'].tender_data.data.complaints} - ${complaint_index}= get_complaint_index_by_complaintID ${complaints} ${complaintID} + ${complaint_index}= get_complaint_index_by_complaintTitle ${complaints} ${complaintTitle} ${field_value}= Get Variable Value ${complaints[${complaint_index}]['${field_name}']} [Return] ${field_value} diff --git a/op_robot_tests/tests_files/keywords.robot b/op_robot_tests/tests_files/keywords.robot index 67d975d3c..26869f67b 100644 --- a/op_robot_tests/tests_files/keywords.robot +++ b/op_robot_tests/tests_files/keywords.robot @@ -563,8 +563,8 @@ Log differences between dicts Звірити поле скарги із значенням - [Arguments] ${username} ${tender_uaid} ${given_value} ${field_name} ${complaintID} ${award_index}=${None} - ${received_value}= Run as ${username} Отримати інформацію із скарги ${tender_uaid} ${complaintID} ${field_name} ${award_index} + [Arguments] ${username} ${tender_uaid} ${given_value} ${field_name} ${complaintTitle} ${award_index}=${None} + ${received_value}= Run as ${username} Отримати інформацію із скарги ${tender_uaid} ${complaintTitle} ${field_name} ${award_index} Порівняти об'єкти ${given_value} ${received_value} @@ -632,8 +632,8 @@ Require Failure Звірити статус вимоги/скарги - [Arguments] ${username} ${tender_uaid} ${complaintID} ${left} ${award_index}=${None} - ${right}= Run as ${username} Отримати інформацію із скарги ${tender_uaid} ${complaintID} status ${award_index} + [Arguments] ${username} ${tender_uaid} ${complaintTitle} ${left} ${award_index}=${None} + ${right}= Run as ${username} Отримати інформацію із скарги ${tender_uaid} ${complaintTitle} status ${award_index} Порівняти об'єкти ${left} ${right} diff --git a/op_robot_tests/tests_files/service_keywords.py b/op_robot_tests/tests_files/service_keywords.py index d376e8fb4..cd41cd038 100644 --- a/op_robot_tests/tests_files/service_keywords.py +++ b/op_robot_tests/tests_files/service_keywords.py @@ -442,6 +442,18 @@ def get_complaint_index_by_complaintID(data, complaintID): return index + +def get_complaint_index_by_complaintTitle(data, complaintTitle): + if not data: + return 0 + for index, element in enumerate(data): + if element.get('title', '') == complaintTitle: + break + else: + index += 1 + return index + + def generate_test_bid_data(tender_data): bid = test_bid_data() if tender_data.get('procurementMethodType', '')[:-2] in ('aboveThreshold', 'competitiveDialogue'):