Alex / prozorro-robot_tests · Commits

Commit a1e6d11b4ef30df753d0aa2815af6904e51a634b

Authored by Leits
1 parent c2ff0fcd

Update keywords for work with users cache

Inline Side-by-side
Showing 3 changed files with 165 additions and 277 deletions
... ... @@ -4,29 +4,27 @@ Library openprocurement_client_helper.py
4 4
5 5 *** Keywords ***
6 6 Отримати internal id по UAid
7   - [Arguments] @{ARGUMENTS}
8   - [Documentation]
9   - ... ${ARGUMENTS[0]} == username
10   - ... ${ARGUMENTS[1]} == tenderid
  7 + [Arguments] ${username} ${tender_uid}
11 8 Log Many @{ARGUMENTS}
12 9 Log Many ${ID_MAP}
13   - ${status}= Run Keyword And Return Status Dictionary Should Contain Key ${ID_MAP} ${ARGUMENTS[1]}
14   - Run Keyword And Return If ${status} Get From Dictionary ${ID_MAP} ${ARGUMENTS[1]}
15   - ${tenders}= get_tenders ${USERS.users['${ARGUMENTS[0]}'].client}
  10 + ${status}= Run Keyword And Return Status Dictionary Should Contain Key ${ID_MAP} ${tender_uid}
  11 + Run Keyword And Return If ${status} Get From Dictionary ${ID_MAP} ${tender_uid}
  12 + ${tenders}= get_tenders ${USERS.users['${username}'].client}
16 13 Log Many @{tenders}
17 14 :FOR ${tender} IN @{tenders}
18 15 \ Set To Dictionary ${ID_MAP} ${tender.tenderID} ${tender.id}
19 16 Log Many ${ID_MAP}
20   - Dictionary Should Contain Key ${ID_MAP} ${ARGUMENTS[1]}
21   - Run Keyword And Return Get From Dictionary ${ID_MAP} ${ARGUMENTS[1]}
  17 + Dictionary Should Contain Key ${ID_MAP} ${tender_uid}
  18 + Run Keyword And Return Get From Dictionary ${ID_MAP} ${tender_uid}
22 19
23 20
24 21 Підготувати клієнт для користувача
25   - [Arguments] @{ARGUMENTS}
  22 + [Arguments] ${username}
26 23 [Documentation] Відкрити браузер, створити об’єкт api wrapper, тощо
27 24 Log Many ${api_host_url} ${api_version}
28   - ${api_wrapper}= prepare_api_wrapper ${USERS.users['${ARGUMENTS[0]}'].api_key} ${api_host_url} ${api_version}
29   - Set To Dictionary ${USERS.users['${ARGUMENTS[0]}']} client ${api_wrapper}
  25 + ${api_wrapper}= prepare_api_wrapper ${USERS.users['${username}'].api_key} ${api_host_url} ${api_version}
  26 + Set To Dictionary ${USERS.users['${username}']} client ${api_wrapper}
  27 + Set To Dictionary ${USERS.users['${username}']} access_token ${EMPTY}
30 28 ${ID_MAP}= Create Dictionary
31 29 Set Suite Variable ${ID_MAP}
32 30 Log Variables
... ... @@ -38,305 +36,208 @@ Library openprocurement_client_helper.py
38 36
39 37
40 38 Створити тендер
41   - [Arguments] @{ARGUMENTS}
42   - ${TENDER_DATA}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} create_tender ${ARGUMENTS[1]}
43   - Log object data ${TENDER_DATA} created_tender
44   - ${access_token}= Get Variable Value ${TENDER_DATA.access.token}
45   - Set To Dictionary ${USERS.users['${ARGUMENTS[0]}']} access_token ${access_token}
46   - Set To Dictionary ${USERS.users['${ARGUMENTS[0]}']} TENDER_DATA ${TENDER_DATA}
  39 + [Arguments] ${username} ${tender_data}
  40 + ${tender}= Call Method ${USERS.users['${username}'].client} create_tender ${tender_data}
  41 + Log object data ${tender} created_tender
  42 + ${access_token}= Get Variable Value ${tender.access.token}
  43 + Set To Dictionary ${USERS.users['${username}']} access_token ${access_token}
  44 + Set To Dictionary ${USERS.users['${username}']} tender_data ${tender}
47 45 Log ${access_token}
48   - Log ${TENDER_DATA.data.id}
49   - Log ${USERS.users['${ARGUMENTS[0]}'].TENDER_DATA}
50   - [return] ${TENDER_DATA.data.tenderID}
  46 + Log ${tender.data.id}
  47 + Log ${USERS.users['${username}'].tender_data}
  48 + [return] ${tender.data.tenderID}
51 49
52 50
53 51 Пошук тендера по ідентифікатору
54   - [Arguments] @{ARGUMENTS}
55   - [Documentation]
56   - ... ${ARGUMENTS[0]} == username
57   - ... ${ARGUMENTS[1]} == tenderId
58   - ${internalid}= Отримати internal id по UAid ${ARGUMENTS[0]} ${ARGUMENTS[1]}
59   - ${tender_data}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} get_tender ${internalid}
60   - Set To Dictionary ${USERS.users['${ARGUMENTS[0]}']} tender_data ${tender_data}
61   - [return] ${tender_data}
  52 + [Arguments] ${username} ${tender_uid}
  53 + ${internalid}= Отримати internal id по UAid ${username} ${tender_uid}
  54 + ${tender}= Отримати тендер ${username} ${internalid}
  55 + [return] ${tender}
62 56
63 57
64 58 Оновити сторінку з тендером
65   - [Arguments] @{ARGUMENTS}
66   - [Documentation]
67   - ... ${ARGUMENTS[0]} == username
68   - ... ${ARGUMENTS[1]} == tenderId
69   - ${tender_data}= openprocurement_client.Пошук тендера по ідентифікатору @{ARGUMENTS}
  59 + [Arguments] ${username} ${tender_uid}
  60 + ${tender_data}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
70 61 Log ${tender_data}
71 62
72 63
73 64 Отримати інформацію із тендера
74   - [Arguments] @{ARGUMENTS}
75   - [Documentation]
76   - ... ${ARGUMENTS[0]} == username
77   - ... ${ARGUMENTS[1]} == fieldname
  65 + [Arguments] ${username} ${fieldname}
78 66 Log Many @{ARGUMENTS}
79   - ${field_value}= Get_From_Object ${USERS.users['${ARGUMENTS[0]}'].tender_data.data} ${ARGUMENTS[1]}
  67 + ${status}= Run Keyword And Return Status Dictionary Should Contain Key ${USERS.users['${username}'].tender_data.data} ${fieldname}
  68 + Run Keyword Unless
  69 + ... ${status}
  70 + ... openprocurement_client.Пошук тендера по ідентифікатору ${username} ${TENDER['TENDER_UAID']}
  71 + ${field_value}= Get_From_Object ${USERS.users['${username}'].tender_data.data} ${fieldname}
80 72 Log ${field_value}
81 73 [return] ${field_value}
82 74
83 75
84 76 Внести зміни в тендер
85   - [Arguments] @{ARGUMENTS}
86   - [Documentation]
87   - ... ${ARGUMENTS[0]} == username
88   - ... ${ARGUMENTS[1]} == id
89   - ... ${ARGUMENTS[2]} == fieldname
90   - ... ${ARGUMENTS[3]} == fieldvalue
91   - ${internalid}= Отримати internal id по UAid ${ARGUMENTS[0]} ${ARGUMENTS[1]}
92   - Отримати тендер ${ARGUMENTS[0]} ${internalid}
93   - Set_To_Object ${TENDER_DATA.data} ${ARGUMENTS[2]} ${ARGUMENTS[3]}
94   - ${TENDER_DATA}= set_access_key ${TENDER_DATA} ${USERS.users['${ARGUMENTS[0]}'].access_token}
95   - ${TENDER_DATA}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} patch_tender ${TENDER_DATA}
96   - Set Global Variable ${TENDER_DATA}
  77 + [Arguments] ${username} ${tender_uid} ${fieldname} ${fieldvalue}
  78 + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
  79 + Set_To_Object ${tender.data} ${fieldname} ${fieldvalue}
  80 + ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token}
  81 + ${tender}= Call Method ${USERS.users['${username}'].client} patch_tender ${tender}
  82 + Set_To_Object ${USERS.users['${username}'].tender_data} ${fieldname} ${fieldvalue}
97 83
98 84
99 85 Отримати тендер
100   - [Arguments] @{ARGUMENTS}
101   - [Documentation]
102   - ... ${ARGUMENTS[0]} == username
103   - ... ${ARGUMENTS[1]} == id
104   - ${TENDER_DATA}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} get_tender ${ARGUMENTS[1]}
105   - Log object data ${TENDER_DATA}
106   - ${TENDER_DATA}= set_access_key ${TENDER_DATA} ${USERS.users['${ARGUMENTS[0]}'].access_token}
107   - Set Global Variable ${TENDER_DATA}
  86 + [Arguments] ${username} ${internalid}
  87 + Log ${username}
  88 + Log ${internalid}
  89 + ${tender}= Call Method ${USERS.users['${username}'].client} get_tender ${internalid}
  90 + ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token}
  91 + Set To Dictionary ${USERS.users['${username}']} tender_data ${tender}
  92 + Log ${tender}
  93 + [Return] ${tender}
108 94
109 95
110 96 Відняти предмети закупівлі
111   - [Arguments] @{ARGUMENTS}
112   - [Documentation]
113   - ... ${ARGUMENTS[0]} == username
114   - ... ${ARGUMENTS[1]} == id
115   - ... ${ARGUMENTS[2]} == number
116   - ${internalid}= Отримати internal id по UAid ${ARGUMENTS[0]} ${ARGUMENTS[1]}
117   - Отримати тендер ${ARGUMENTS[0]} ${internalid}
118   - @{items}= Get From Object ${TENDER_DATA.data} items
  97 + [Arguments] ${username} ${tender_uid} ${number}
  98 + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
  99 + @{items}= Get From Object ${tender.data} items
119 100 Log Many @{items}
120   - :FOR ${INDEX} IN RANGE ${ARGUMENTS[2]}
  101 + :FOR ${INDEX} IN RANGE ${number}
121 102 \ Remove From List ${items} 0
122 103 Log Many @{items}
123   - Set_To_Object ${TENDER_DATA.data} items ${items}
124   - ${TENDER_DATA}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} patch_tender ${TENDER_DATA}
125   - ${TENDER_DATA}= set_access_key ${TENDER_DATA} ${USERS.users['${ARGUMENTS[0]}'].access_token}
  104 + Set_To_Object ${tender.data} items ${items}
  105 + Call Method ${USERS.users['${username}'].client} patch_tender ${tender}
126 106
127 107
128 108 Додати предмети закупівлі
129   - [Arguments] @{ARGUMENTS}
130   - [Documentation]
131   - ... ${ARGUMENTS[0]} == username
132   - ... ${ARGUMENTS[1]} == id
133   - ... ${ARGUMENTS[2]} == number
134   - ${internalid}= Отримати internal id по UAid ${ARGUMENTS[0]} ${ARGUMENTS[1]}
135   - Отримати тендер ${ARGUMENTS[0]} ${internalid}
136   - @{items}= Get From Object ${TENDER_DATA.data} items
  109 + [Arguments] ${username} ${tender_uid} ${number}
  110 + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
  111 + @{items}= Get From Object ${tender.data} items
137 112 Log Many @{items}
138   - :FOR ${INDEX} IN RANGE ${ARGUMENTS[2]}
  113 + :FOR ${INDEX} IN RANGE ${number}
139 114 \ ${item}= test_item_data
140 115 \ Append To List ${items} ${item}
141 116 Log Many @{items}
142   - Set_To_Object ${TENDER_DATA.data} items ${items}
143   - ${TENDER_DATA}= set_access_key ${TENDER_DATA} ${USERS.users['${ARGUMENTS[0]}'].access_token}
144   - ${TENDER_DATA}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} patch_tender ${TENDER_DATA}
  117 + Set_To_Object ${tender.data} items ${items}
  118 + ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token}
  119 + Call Method ${USERS.users['${username}'].client} patch_tender ${tender}
145 120
146 121
147 122 Задати питання
148   - [Documentation]
149   - ... ${ARGUMENTS[0]} == username
150   - ... ${ARGUMENTS[1]} == tender_uid
151   - ... ${ARGUMENTS[2]} == question
152   - [Arguments] @{ARGUMENTS}
153   - Log many @{ARGUMENTS}
154   - ${internalid}= Отримати internal id по UAid ${ARGUMENTS[0]} ${ARGUMENTS[1]}
155   - ${tender}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} get_tender ${internalid}
156   - Log ${USERS.users['${ARGUMENTS[0]}']}
157   - ${biddingresponse}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} create_question ${tender} ${ARGUMENTS[2]}
  123 + [Arguments] ${username} ${tender_uid} ${question}
  124 + Log ${question}
  125 + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
  126 + ${biddingresponse}= Call Method ${USERS.users['${username}'].client} create_question ${tender} ${question}
158 127 [return] ${biddingresponse}
159 128
160 129
161 130 Відповісти на питання
162   - [Documentation]
163   - ... ${ARGUMENTS[0]} == username
164   - ... ${ARGUMENTS[1]} == tender_uid
165   - ... ${ARGUMENTS[2]} == question_id
166   - ... ${ARGUMENTS[3]} == answer_data
167   - [Arguments] @{ARGUMENTS}
168   - Log many @{ARGUMENTS}
169   - ${internalid}= Отримати internal id по UAid ${ARGUMENTS[0]} ${ARGUMENTS[1]}
170   - ${tender}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} get_tender ${internalid}
171   - Log many ${USERS.users['${ARGUMENTS[0]}']}
172   - ${tender}= set_access_key ${tender} ${USERS.users['${ARGUMENTS[0]}'].access_token}
173   - ${ARGUMENTS[3].data.id}= Set Variable ${tender.data.questions[${ARGUMENTS[2]}].id}
174   - ${question_with_answer}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} patch_question ${tender} ${ARGUMENTS[3]}
175   - Log many ${USERS.users['${ARGUMENTS[0]}'].client} ${tender} ${ARGUMENTS[3]}
  131 + [Arguments] ${username} ${tender_uid} ${question_id} ${answer_data}
  132 + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
  133 + ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token}
  134 + ${answer_data.data.id}= Set Variable ${tender.data.questions[${question_id}].id}
  135 + ${question_with_answer}= Call Method ${USERS.users['${username}'].client} patch_question ${tender} ${answer_data}
176 136 Log object data ${question_with_answer} question_with_answer
177 137
178 138
179 139 Подати скаргу
180   - [Documentation]
181   - ... ${ARGUMENTS[0]} == username
182   - ... ${ARGUMENTS[1]} == tender_uid
183   - ... ${ARGUMENTS[2]} == complaint
184   - [Arguments] @{ARGUMENTS}
185   - Log many @{ARGUMENTS}
186   - ${internalid}= Отримати internal id по UAid ${ARGUMENTS[0]} ${ARGUMENTS[1]}
187   - ${tender}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} get_tender ${internalid}
188   - ${complaint}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} _create_tender_resource_item ${tender} ${ARGUMENTS[2]} complaints
  140 + [Arguments] ${username} ${tender_uid} ${complaint}
  141 + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
  142 + ${complaint}= Call Method ${USERS.users['${username}'].client} _create_tender_resource_item ${tender} ${complaint} complaints
189 143 ${access_token}= Get Variable Value ${complaint.access.token}
190   - Set To Dictionary ${USERS.users['${ARGUMENTS[0]}']} access_token ${access_token}
  144 + Set To Dictionary ${USERS.users['${username}']} access_token ${access_token}
191 145 Log object data ${complaint} complaint
192 146
193 147
194 148 Порівняти скаргу
195   - [Documentation]
196   - ... ${ARGUMENTS[0]} == username
197   - ... ${ARGUMENTS[1]} == tender_uid
198   - ... ${ARGUMENTS[2]} == complaint
199   - [Arguments] @{ARGUMENTS}
  149 + [Arguments] ${username} ${tender_uid} ${complaint}
200 150 Log many @{ARGUMENTS}
201   - ${internalid}= Отримати internal id по UAid ${ARGUMENTS[0]} ${ARGUMENTS[1]}
202   - ${tender}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} get_tender ${internalid}
  151 + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
203 152 ${complaint}= Get Variable Value ${tender.data.complaints[0]}
204 153 Log ${complaint}
205 154 #TODO: COMPARE
206   - #Dictionary Should Contain Sub Dictionary ${complaint} ${ARGUMENTS[2].data}
207   - #:FOR ${element} IN ${ARGUMENTS[2].data}
  155 + #Dictionary Should Contain Sub Dictionary ${complaint} ${complaint.data}
  156 + #:FOR ${element} IN ${complaint.data}
208 157 #\ Log ${element}
209 158 #\ Dictionary Should Contain Value ${complaint} ${element}
210 159
211 160
212 161 Обробити скаргу
213   - [Documentation]
214   - ... ${ARGUMENTS[0]} == username
215   - ... ${ARGUMENTS[1]} == tender_uid
216   - ... ${ARGUMENTS[2]} == question_id
217   - ... ${ARGUMENTS[3]} == answer_data
218   - [Arguments] @{ARGUMENTS}
219   - Log many @{ARGUMENTS}
220   - ${internalid}= Отримати internal id по UAid ${ARGUMENTS[0]} ${ARGUMENTS[1]}
221   - ${tender}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} get_tender ${internalid}
222   - ${tender}= set_access_key ${tender} ${USERS.users['${ARGUMENTS[0]}'].access_token}
223   - ${ARGUMENTS[3].data.id}= Set Variable ${tender.data.complaints[${ARGUMENTS[2]}].id}
224   - ${complaint_with_answer}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} _patch_tender_resource_item ${tender} ${ARGUMENTS[3]} complaints
225   - Log many ${USERS.users['${ARGUMENTS[0]}'].client} ${tender} ${ARGUMENTS[3]}
  162 + [Arguments] ${username} ${tender_uid} ${complaint_id} ${answer_data}
  163 + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
  164 + ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token}
  165 + ${answer_data.data.id}= Set Variable ${tender.data.complaints[${complaint_id}].id}
  166 + ${complaint_with_answer}= Call Method ${USERS.users['${username}'].client} _patch_tender_resource_item ${tender} ${answer_data} complaints
  167 + Log many ${USERS.users['${username}'].client} ${tender} ${answer_data}
226 168 Log object data ${complaint_with_answer} complaint_with_answer
227 169
228 170
229 171 Подати цінову пропозицію
230   - [Documentation]
231   - ... ${ARGUMENTS[0]} == username
232   - ... ${ARGUMENTS[1]} == tender_uid
233   - ... ${ARGUMENTS[2]} == bid
234   - [Arguments] @{ARGUMENTS}
235   - Log many @{ARGUMENTS}
236   - ${internalid}= Отримати internal id по UAid ${ARGUMENTS[0]} ${ARGUMENTS[1]}
237   - ${tender}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} get_tender ${internalid}
238   - Log ${tender}
239   - ${biddingresponse}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} create_bid ${tender} ${ARGUMENTS[2]}
  172 + [Arguments] ${username} ${tender_uid} ${bid}
  173 + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
  174 + ${biddingresponse}= Call Method ${USERS.users['${username}'].client} create_bid ${tender} ${bid}
  175 + Log ${biddingresponse}
240 176 [return] ${biddingresponse}
241 177
242 178
243 179 Змінити цінову пропозицію
244   - [Documentation]
245   - ... ${ARGUMENTS[0]} == username
246   - ... ${ARGUMENTS[1]} == tender_uid
247   - ... ${ARGUMENTS[2]} == bid
248   - [Arguments] @{ARGUMENTS}
249   - ${internalid}= Отримати internal id по UAid ${ARGUMENTS[0]} ${ARGUMENTS[1]}
250   - ${tender}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} get_tender ${internalid}
251   - ${changed_bid}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} patch_bid ${tender} ${ARGUMENTS[2]}
  180 + [Arguments] ${username} ${tender_uid} ${bid}
  181 + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
  182 + ${changed_bid}= Call Method ${USERS.users['${username}'].client} patch_bid ${tender} ${bid}
252 183 Log ${changed_bid}
253 184 [return] ${changed_bid}
254 185
255 186
256 187 Скасувати цінову пропозицію
257   - [Documentation]
258   - ... ${ARGUMENTS[0]} == username
259   - ... ${ARGUMENTS[1]} == tender_uid
260   - ... ${ARGUMENTS[2]} == bid
261   - [Arguments] @{ARGUMENTS}
262   - Log many @{ARGUMENTS}
263   - ${internalid}= Отримати internal id по UAid ${ARGUMENTS[0]} ${ARGUMENTS[1]}
264   - ${tender}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} get_tender ${internalid}
265   - Log ${tender}
266   - ${changed_bid}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} delete_bid ${tender} ${ARGUMENTS[2]}
  188 + [Arguments] ${username} ${tender_uid} ${bid}
  189 + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
  190 + ${changed_bid}= Call Method ${USERS.users['${username}'].client} delete_bid ${tender} ${bid}
267 191 Log ${changed_bid}
268 192 [return] ${changed_bid}
269 193
270 194
271 195 Прийняти цінову пропозицію
272   - [Documentation]
273   - ... ${ARGUMENTS[0]} == username
274   - ... ${ARGUMENTS[1]} == tender_uid
275   - ... ${ARGUMENTS[2]} == award
276   - [Arguments] @{ARGUMENTS}
277   - ${internalid}= Отримати internal id по UAid ${ARGUMENTS[0]} ${ARGUMENTS[1]}
278   - ${tender}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} get_tender ${internalid}
279   - ${tender}= set_access_key ${tender} ${USERS.users['${ARGUMENTS[0]}'].access_token}
280   - ${award_activeted_response}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} patch_award ${tender} ${ARGUMENTS[2]}
  196 + [Arguments] ${username} ${tender_uid} ${award}
  197 + ${internalid}= Отримати internal id по UAid ${username} ${tender_uid}
  198 + ${tender}= Call Method ${USERS.users['${username}'].client} get_tender ${internalid}
  199 + ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token}
  200 + ${award_activeted_response}= Call Method ${USERS.users['${username}'].client} patch_award ${tender} ${award}
281 201 Log ${award_activeted_response}
282 202 [return] ${award_activeted_response}
283 203
284 204
285 205 Завантажити документ в ставку
286   - [Documentation]
287   - ... ${ARGUMENTS[0]} == username
288   - ... ${ARGUMENTS[1]} == path
289   - ... ${ARGUMENTS[2]} == tenderid
290   - [Arguments] @{ARGUMENTS}
291   - Log many @{ARGUMENTS}
292   - ${bid_id}= Get Variable Value ${USERS.users['${ARGUMENTS[0]}'].bidresponses['resp'].data.id}
293   - ${internalid}= Отримати internal id по UAid ${ARGUMENTS[0]} ${ARGUMENTS[2]}
294   - ${tender}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} get_tender ${internalid}
295   - ${tender}= set_access_key ${tender} ${USERS.users['${ARGUMENTS[0]}'].bidresponses['resp'].access.token}
296   - ${response}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} upload_bid_document ${ARGUMENTS[1]} ${tender} ${bid_id}
297   - ${uploaded_file} = Create Dictionary filepath ${ARGUMENTS[1]} upload_response ${response}
  206 + [Arguments] ${username} ${path} ${tender_uid}
  207 + ${bid_id}= Get Variable Value ${USERS.users['${username}'].bidresponses['resp'].data.id}
  208 + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
  209 + ${tender}= set_access_key ${tender} ${USERS.users['${username}'].bidresponses['resp'].access.token}
  210 + ${response}= Call Method ${USERS.users['${username}'].client} upload_bid_document ${path} ${tender} ${bid_id}
  211 + ${uploaded_file} = Create Dictionary filepath ${path} upload_response ${response}
298 212 Log ${response}
299 213 Log object data ${uploaded_file}
300 214 [return] ${uploaded_file}
301 215
302 216
303 217 Змінити документ в ставці
304   - [Documentation]
305   - ... ${ARGUMENTS[0]} == username
306   - ... ${ARGUMENTS[1]} == path
307   - ... ${ARGUMENTS[2]} == bidid
308   - ... ${ARGUMENTS[3]} == docid
309   - [Arguments] @{ARGUMENTS}
310   - Log many @{ARGUMENTS}
311   - ${internalid}= Отримати internal id по UAid ${ARGUMENTS[0]} ${TENDER['TENDER_UAID']}
312   - ${tender}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} get_tender ${internalid}
313   - ${tender}= set_access_key ${tender} ${USERS.users['${ARGUMENTS[0]}'].bidresponses['resp'].access.token}
314   - ${response}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} update_bid_document ${ARGUMENTS[1]} ${tender} ${ARGUMENTS[2]} ${ARGUMENTS[3]}
315   - ${uploaded_file} = Create Dictionary filepath ${ARGUMENTS[1]} upload_response ${response}
  218 + [Arguments] ${username} ${path} ${bidid} ${docid}
  219 + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${TENDER['TENDER_UAID']}
  220 + ${tender}= set_access_key ${tender} ${USERS.users['${username}'].bidresponses['resp'].access.token}
  221 + ${response}= Call Method ${USERS.users['${username}'].client} update_bid_document ${path} ${tender} ${bidid} ${docid}
  222 + ${uploaded_file} = Create Dictionary filepath ${path} upload_response ${response}
316 223 Log ${response}
317 224 Log object data ${uploaded_file}
318 225 [return] ${uploaded_file}
319 226
320 227
321 228 Завантажити документ
322   - [Documentation]
323   - ... ${ARGUMENTS[0]} == username
324   - ... ${ARGUMENTS[1]} == filepath
325   - ... ${ARGUMENTS[2]} == TENDER['TENDER_UAID']
326   - [Arguments] @{ARGUMENTS}
  229 + [Arguments] ${username} ${filepath} ${tender_uid}
327 230 Log many @{ARGUMENTS}
328   - ${tenderID}= openprocurement_client.Отримати internal id по UAid ${ARGUMENTS[0]} ${ARGUMENTS[2]}
329   - ${tender}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} get_tender ${tenderID}
330   - ${tender}= set_access_key ${tender} ${USERS.users['${ARGUMENTS[0]}'].access_token}
331   - ${reply}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} upload_document ${ARGUMENTS[1]} ${tender}
  231 + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
  232 + ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token}
  233 + ${reply}= Call Method ${USERS.users['${username}'].client} upload_document ${filepath} ${tender}
332 234 Log object data ${reply} reply
333 235 [return] ${reply}
334 236
335 237
336 238 Отримати посилання на аукціон для глядача
337 239 [Arguments] ${username} ${tender_uid}
338   - ${internalid}= Отримати internal id по UAid ${username} ${tender_uid}
339   - ${tender}= Call Method ${USERS.users['${username}'].client} get_tender ${internalid}
  240 + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
340 241 [return] ${tender.data.auctionUrl}
341 242
342 243
... ... @@ -348,84 +249,65 @@ Library openprocurement_client_helper.py
348 249
349 250 Отримати пропозицію
350 251 [Arguments] ${username} ${tender_uid}
351   - ${internalid}= Отримати internal id по UAid ${username} ${tender_uid}
  252 + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
352 253 ${bid_id}= Get Variable Value ${USERS.users['${username}'].bidresponses['resp'].data.id}
353 254 ${token}= Get Variable Value ${USERS.users['${username}'].bidresponses['resp'].access.token}
354   - ${tender}= Call Method ${USERS.users['${username}'].client} get_tender ${internalid}
355 255 ${bid}= Call Method ${USERS.users['${username}'].client} get_bid ${tender} ${bid_id} ${token}
356 256 [return] ${bid}
357 257
358 258
359 259 Отримати документ
360   - [Documentation]
361   - ... ${ARGUMENTS[0]} == username
362   - ... ${ARGUMENTS[1]} == TENDER['TENDER_UAID']
363   - ... ${ARGUMENTS[2]} == url
364   - [Arguments] @{ARGUMENTS}
365   - Log many @{ARGUMENTS}
366   - ${tenderID}= openprocurement_client.Отримати internal id по UAid ${ARGUMENTS[0]} ${ARGUMENTS[1]}
367   - ${tender}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} get_tender ${tenderID}
368   - ${token}= Get Variable Value ${USERS.users['${ARGUMENTS[0]}'].bidresponses['resp'].access.token}
369   - ${contents} ${filename}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} get_file ${tender} ${ARGUMENTS[2]} ${token}
  260 + [Arguments] ${username} ${tender_uid} ${url}
  261 + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
  262 + ${token}= Get Variable Value ${USERS.users['${username}'].bidresponses['resp'].access.token}
  263 + ${contents} ${filename}= Call Method ${USERS.users['${username}'].client} get_file ${tender} ${url} ${token}
370 264 Log ${filename}
371 265 [return] ${contents} ${filename}
372 266
373 267
374 268 Створити лот
375   - [Documentation]
376   - ... ${ARGUMENTS[0]} == username
377   - ... ${ARGUMENTS[1]} == tender
378   - ... ${ARGUMENTS[2]} == lot
379   - [Arguments] @{ARGUMENTS}
  269 + [Arguments] ${username} ${tender} ${lot}
380 270 Log many @{ARGUMENTS}
381   - ${tender}= set_access_key ${ARGUMENTS[1]} ${USERS.users['${ARGUMENTS[0]}'].access_token}
382   - ${tender_lot}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} create_lot ${tender} ${ARGUMENTS[2]}
  271 + ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token}
  272 + ${tender_lot}= Call Method ${USERS.users['${username}'].client} create_lot ${tender} ${lot}
383 273 Log ${tender_lot}
384 274 [return] ${tender_lot}
  275 + #TODO:
  276 + #[Arguments] ${username} ${tender_uid} ${lot}
  277 + #${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
385 278
386 279
387 280 Змінити лот
388   - [Documentation]
389   - ... ${ARGUMENTS[0]} == username
390   - ... ${ARGUMENTS[1]} == tender
391   - ... ${ARGUMENTS[2]} == lot
392   - [Arguments] @{ARGUMENTS}
393   - Log many @{ARGUMENTS}
394   - ${tender}= set_access_key ${ARGUMENTS[1]} ${USERS.users['${ARGUMENTS[0]}'].access_token}
395   - ${tender_lot}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} patch_lot ${tender} ${ARGUMENTS[2]}
  281 + [Arguments] ${username} ${tender} ${lot}
  282 + ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token}
  283 + ${tender_lot}= Call Method ${USERS.users['${username}'].client} patch_lot ${tender} ${lot}
396 284 Log ${tender_lot}
397 285 [return] ${tender_lot}
  286 + #TODO:
  287 + #[Arguments] ${username} ${tender_uid} ${lot}
  288 + #${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
398 289
399 290
400 291 Завантажити документ в лот
401   - [Documentation]
402   - ... ${ARGUMENTS[0]} == username
403   - ... ${ARGUMENTS[1]} == filepath
404   - ... ${ARGUMENTS[2]} == tenderUAID
405   - ... ${ARGUMENTS[3]} == lot_id
406   - [Arguments] @{ARGUMENTS}
407   - Log many @{ARGUMENTS}
408   - ${tenderID}= openprocurement_client.Отримати internal id по UAid ${ARGUMENTS[0]} ${ARGUMENTS[2]}
409   - ${tender}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} get_tender ${tenderID}
410   - ${tender}= set_access_key ${tender} ${USERS.users['${ARGUMENTS[0]}'].access_token}
411   - ${doc}= Завантажити документ ${ARGUMENTS[0]} ${ARGUMENTS[1]} ${ARGUMENTS[2]}
412   - ${lot_doc}= test_lot_document_data ${doc} ${ARGUMENTS[3]}
413   - ${reply}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} patch_document ${tender} ${lot_doc}
  292 + [Arguments] ${username} ${filepath} ${tender_uid} ${lot_id}
  293 + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
  294 + ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token}
  295 + ${doc}= Завантажити документ ${username} ${filepath} ${tender_uid}
  296 + ${lot_doc}= test_lot_document_data ${doc} ${lot_id}
  297 + ${reply}= Call Method ${USERS.users['${username}'].client} patch_document ${tender} ${lot_doc}
414 298 Log object data ${reply} reply
415 299 [return] ${reply}
416 300
417 301
418 302 Видалити лот
419   - [Documentation]
420   - ... ${ARGUMENTS[0]} == username
421   - ... ${ARGUMENTS[1]} == tender
422   - ... ${ARGUMENTS[2]} == lot
423   - [Arguments] @{ARGUMENTS}
424   - Log many @{ARGUMENTS}
425   - ${tender}= set_access_key ${ARGUMENTS[1]} ${USERS.users['${ARGUMENTS[0]}'].access_token}
426   - ${tender_lot}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} delete_lot ${tender} ${ARGUMENTS[2]}
  303 + [Arguments] ${username} ${tender} ${lot}
  304 + ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token}
  305 + ${tender_lot}= Call Method ${USERS.users['${username}'].client} delete_lot ${tender} ${lot}
427 306 Log ${tender_lot}
428 307 [return] ${tender_lot}
  308 + #TODO:
  309 + #[Arguments] ${username} ${tender_uid} ${lot}
  310 + #${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uid}
429 311
430 312 ##############################################################################
431 313 # Limited procurement
... ...
... ... @@ -126,8 +126,7 @@ Get Broker Property By Username
126 126 Звірити поле тендера
127 127 [Arguments] ${username} ${tender_data} ${field}
128 128 ${left}= Get_From_Object ${tender_data.data} ${field}
129   - ${right}= Викликати для учасника ${username} Отримати інформацію із тендера ${field}
130   - Порівняти об'єкти ${left} ${right}
  129 + Звірити поле тендера із значенням ${username} ${left} ${field}
131 130
132 131
133 132 Звірити поле тендера із значенням
... ... @@ -147,8 +146,7 @@ Get Broker Property By Username
147 146 Звірити дату тендера
148 147 [Arguments] ${username} ${tender_data} ${field}
149 148 ${left}= Get_From_Object ${tender_data.data} ${field}
150   - ${right}= Викликати для учасника ${username} Отримати інформацію із тендера ${field}
151   - Звірити дату ${left} ${right}
  149 + Звірити дату тендера із значенням ${username} ${left} ${field}
152 150
153 151
154 152 Звірити дату тендера із значенням
... ... @@ -229,16 +227,24 @@ SwitchState
229 227
230 228
231 229 Дочекатись дати початку прийому пропозицій
232   - Дочекатись дати ${tender_data.data.tenderPeriod.startDate}
  230 + [Arguments] ${username}
  231 + log ${username}
  232 + Дочекатись дати ${USERS.users['${username}'].tender_data.data.tenderPeriod.startDate}
233 233
234 234
235 235 Дочекатись дати закінчення прийому пропозицій
236   - Дочекатись дати ${tender_data.data.tenderPeriod.endDate}
  236 + [Arguments] ${username}
  237 + log ${username}
  238 + Дочекатись дати ${USERS.users['${username}'].tender_data.data.tenderPeriod.endDate}
237 239
238 240
239 241 Дочекатись дати початку аукціону
240   - Дочекатись дати ${tender_data.data.auctionPeriod.startDate}
  242 + [Arguments] ${username}
  243 + log ${username}
  244 + Дочекатись дати ${USERS.users['${username}'].tender_data.data.auctionPeriod.startDate}
241 245
242 246
243 247 Дочекатись дати закінчення аукціону
244   - Дочекатись дати ${tender_data.data.auctionPeriod.endDate}
  248 + [Arguments] ${username}
  249 + log ${username}
  250 + Дочекатись дати ${USERS.users['${username}'].tender_data.data.auctionPeriod.endDate}
... ...
... ... @@ -284,11 +284,8 @@ ${question_id} 0
284 284 ... ${USERS.users['${provider}'].broker}
285 285 ${bid}= test bid data
286 286 Log ${bid}
287   - ${bidresponses}= Create Dictionary
288 287 ${bid_before_bidperiod_resp}= Викликати для учасника ${provider} Подати цінову пропозицію shouldfail ${TENDER['TENDER_UAID']} ${bid}
289   - Set To Dictionary ${bidresponses} bid_before_bidperiod_resp ${bid_before_bidperiod_resp}
290   - Set To Dictionary ${USERS.users['${provider}']} bidresponses ${bidresponses}
291   - log ${USERS.users['${provider}']}
  288 + Log ${bid_before_bidperiod_resp}
292 289
293 290 #######
294 291 #Відображення відповіді на запитання
... ... @@ -313,7 +310,7 @@ ${question_id} 0
313 310 [Tags] ${USERS.users['${provider}'].broker}: Можливість подати цінову пропозицію
314 311 ... provider
315 312 ... ${USERS.users['${provider}'].broker}
316   - Дочекатись дати початку прийому пропозицій
  313 + Дочекатись дати початку прийому пропозицій ${provider}
317 314 ${bid}= test bid data
318 315 Log ${bid}
319 316 ${biddingresponse0}= Викликати для учасника ${provider} Подати цінову пропозицію ${TENDER['TENDER_UAID']} ${bid}
... ... @@ -331,12 +328,13 @@ ${question_id} 0
331 328 ... provider
332 329 ... ${USERS.users['${provider}'].broker}
333 330 ... minimal
334   - Дочекатись дати початку прийому пропозицій
  331 + Дочекатись дати початку прийому пропозицій ${provider}
335 332 ${bid}= test bid data
336 333 Log ${bid}
  334 + ${bidresponses}= Create Dictionary
337 335 ${resp}= Викликати для учасника ${provider} Подати цінову пропозицію ${TENDER['TENDER_UAID']} ${bid}
338   - Set To Dictionary ${USERS.users['${provider}'].bidresponses} resp ${resp}
339   - log ${resp}
  336 + Set To Dictionary ${bidresponses} resp ${resp}
  337 + Set To Dictionary ${USERS.users['${provider}']} bidresponses ${bidresponses}
340 338 log ${USERS.users['${provider}'].bidresponses}
341 339
342 340 Можливість змінити повторну цінову пропозицію до 50000
... ... @@ -392,7 +390,7 @@ ${question_id} 0
392 390 ... provider1
393 391 ... ${USERS.users['${provider1}'].broker}
394 392 ... minimal
395   - Дочекатись дати початку прийому пропозицій
  393 + Дочекатись дати початку прийому пропозицій ${provider1}
396 394 ${bid}= test bid data
397 395 Log ${bid}
398 396 ${bidresponses}= Create Dictionary
... ... @@ -423,7 +421,7 @@ ${question_id} 0
423 421 [Tags] ${USERS.users['${provider1}'].broker}: Неможливість змінити цінову пропозицію до 50000 після закінчення прийому пропозицій
424 422 ... provider1
425 423 ... ${USERS.users['${provider1}'].broker}
426   - Дочекатись дати закінчення прийому пропозицій
  424 + Дочекатись дати закінчення прийому пропозицій ${provider1}
427 425 Set To Dictionary ${USERS.users['${provider1}'].bidresponses['resp'].data.value} amount 50000
428 426 Log ${USERS.users['${provider1}'].bidresponses['resp'].data.value}
429 427 ${failfixbidto50000resp}= Викликати для учасника ${provider1} Змінити цінову пропозицію shouldfail ${TENDER['TENDER_UAID']} ${USERS.users['${provider1}'].bidresponses['resp']}
... ... @@ -469,6 +467,8 @@ ${question_id} 0
469 467 ... viewer
470 468 ... ${USERS.users['${viewer}'].broker}
471 469 ... minimal
  470 + Дочекатись дати закінчення прийому пропозицій ${viewer}
  471 + Дочекатись синхронізації з майданчиком ${viewer}
472 472 Sleep 120
473 473 ${url}= Викликати для учасника ${viewer} Отримати посилання на аукціон для глядача ${TENDER['TENDER_UAID']}
474 474 Log URL аукціону для глядача: ${url}
... ...
Please register or login to post a comment