From 9677cb1a7620f34299b2abab82e1d89e0620fa28 Mon Sep 17 00:00:00 2001
From: mykhaly <yurkamykhalchuk@gmail.com>
Date: Mon, 5 Sep 2016 17:56:24 +0300
Subject: [PATCH] Rename `get_id_from_doc_name` into `get_id_from_string`
Add `c` prefix to regex in order to include ids in cancellations.
---
op_robot_tests/tests_files/base_keywords.robot | 12 ++++++------
op_robot_tests/tests_files/keywords.robot | 2 +-
op_robot_tests/tests_files/service_keywords.py | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/op_robot_tests/tests_files/base_keywords.robot b/op_robot_tests/tests_files/base_keywords.robot
index 218a104..7038f6e 100644
--- a/op_robot_tests/tests_files/base_keywords.robot
+++ b/op_robot_tests/tests_files/base_keywords.robot
@@ -42,7 +42,7 @@ Resource resource.robot
Можливість додати документацію до тендера
${file_path} ${file_name} ${file_content}= create_fake_doc
Run As ${tender_owner} Завантажити документ ${file_path} ${TENDER['TENDER_UAID']}
- ${doc_id}= get_id_from_doc_name ${file_name}
+ ${doc_id}= get_id_from_string ${file_name}
${tender_document}= Create Dictionary
... doc_name=${file_name}
... doc_id=${doc_id}
@@ -162,7 +162,7 @@ Resource resource.robot
${lot_id}= get_id_from_object ${USERS.users['${tender_owner}'].tender_data.data.lots[${lot_index}]}
${file_path} ${file_name} ${file_content}= create_fake_doc
Run As ${tender_owner} Завантажити документ в лот ${file_path} ${TENDER['TENDER_UAID']} ${lot_id}
- ${doc_id}= get_id_from_doc_name ${file_name}
+ ${doc_id}= get_id_from_string ${file_name}
${data}= Create Dictionary
... doc_name=${file_name}
... doc_id=${doc_id}
@@ -528,7 +528,7 @@ Resource resource.robot
... ${TENDER['TENDER_UAID']}
... ${claim}
... ${file_path}
- ${doc_id}= get_id_from_doc_name ${file_name}
+ ${doc_id}= get_id_from_string ${file_name}
${claim_data}= Create Dictionary
... claim=${claim}
... complaintID=${complaintID}
@@ -550,7 +550,7 @@ Resource resource.robot
... ${claim}
... ${lot_id}
... ${file_path}
- ${doc_id}= get_id_from_doc_name ${file_name}
+ ${doc_id}= get_id_from_string ${file_name}
${claim_data}= Create Dictionary
... claim=${claim}
... complaintID=${complaintID}
@@ -571,7 +571,7 @@ Resource resource.robot
... ${claim}
... ${award_index}
... ${file_path}
- ${doc_id}= get_id_from_doc_name ${file_name}
+ ${doc_id}= get_id_from_string ${file_name}
${claim_data}= Create Dictionary
... claim=${claim}
... complaintID=${complaintID}
@@ -962,7 +962,7 @@ Resource resource.robot
... ${TENDER['TENDER_UAID']}
... ${supplier_data}
... ${file_path}
- ${doc_id}= get_id_from_doc_name ${file_name}
+ ${doc_id}= get_id_from_string ${file_name}
Set to dictionary ${USERS.users['${tender_owner}']} award_doc_name=${file_name} award_doc_id=${doc_id} award_doc_content=${file_content}
Remove File ${file_path}
diff --git a/op_robot_tests/tests_files/keywords.robot b/op_robot_tests/tests_files/keywords.robot
index d924f06..bc8ac10 100644
--- a/op_robot_tests/tests_files/keywords.robot
+++ b/op_robot_tests/tests_files/keywords.robot
@@ -269,7 +269,7 @@ Get Broker Property By Username
[Arguments] ${username}
${cancellation_reason}= create_fake_sentence
${file_path} ${file_name} ${file_content}= create_fake_doc
- ${doc_id}= get_id_from_doc_name ${file_name}
+ ${doc_id}= get_id_from_string ${file_name}
${document}= Create Dictionary
... doc_path=${file_path}
... doc_name=${file_name}
diff --git a/op_robot_tests/tests_files/service_keywords.py b/op_robot_tests/tests_files/service_keywords.py
index 9c026b6..20d2bae 100644
--- a/op_robot_tests/tests_files/service_keywords.py
+++ b/op_robot_tests/tests_files/service_keywords.py
@@ -409,8 +409,8 @@ def get_id_from_object(obj):
return obj_id.group(1)
-def get_id_from_doc_name(name):
- return re.match(r'd\-[0-9a-fA-F]{8}', name).group(0)
+def get_id_from_string(string):
+ return re.match(r'[dc]\-[0-9a-fA-F]{8}', string).group(0)
def get_object_type_by_id(object_id):
--
libgit2 0.24.0