Commit 454bac3863e1efc1b923b944d8bc173e279c3c9e

Authored by biviktorqc
2 parents c1bcf9b3 eb15f058

Merge remote-tracking branch 'yboi/E-Tender' into candy

Conflicts:
	op_robot_tests/tests_files/brokers/etender.robot
	op_robot_tests/tests_files/data/users.yaml
@@ -7,6 +7,10 @@ Library DateTime @@ -7,6 +7,10 @@ Library DateTime
7 ${locator.tenderId} jquery=h3 7 ${locator.tenderId} jquery=h3
8 ##Використовую такий шлях у кожного буде мінятись /yboi/. Міняйте на сві шлях до файлу 8 ##Використовую такий шлях у кожного буде мінятись /yboi/. Міняйте на сві шлях до файлу
9 ${file_add} /home/yboi/openprocurement.robottests.buildout/Document.docx 9 ${file_add} /home/yboi/openprocurement.robottests.buildout/Document.docx
  10 +${locator.title} xpath=(//div[@class = 'col-sm-8']/p[@class='ng-binding'])[6]
  11 +${locator.description} xpath=(//div[@class = 'col-sm-8']/p[@class='ng-binding'])[7]
  12 +${locator.minimalStep.amount} xpath=(//div[@class = 'col-sm-8']/p[@class='ng-binding'])[9]
  13 +${locator.value.amount} xpath=(//div[@class = 'col-sm-8']/p[@class='ng-binding'])[8]
10 14
11 *** Keywords *** 15 *** Keywords ***
12 Підготувати клієнт для користувача 16 Підготувати клієнт для користувача
@@ -39,8 +43,6 @@ Login @@ -39,8 +43,6 @@ Login
39 ${items_description}= Get From Dictionary ${prepared_tender_data.data} description 43 ${items_description}= Get From Dictionary ${prepared_tender_data.data} description
40 ${quantity}= Get From Dictionary ${items[0]} quantity 44 ${quantity}= Get From Dictionary ${items[0]} quantity
41 ${cpv}= Get From Dictionary ${items[0].classification} id 45 ${cpv}= Get From Dictionary ${items[0].classification} id
42 - ${dkpp_desc}= Get From Dictionary ${items[0].additionalClassifications[0]} description  
43 - ${dkpp_id}= Get From Dictionary ${items[0].additionalClassifications[0]} id  
44 ${unit}= Get From Dictionary ${items[0].unit} name 46 ${unit}= Get From Dictionary ${items[0].unit} name
45 ${start_date}= Get From Dictionary ${prepared_tender_data.data.tenderPeriod} startDate 47 ${start_date}= Get From Dictionary ${prepared_tender_data.data.tenderPeriod} startDate
46 ${start_date}= convert_date_to_etender_format ${start_date} 48 ${start_date}= convert_date_to_etender_format ${start_date}
@@ -79,7 +81,6 @@ Login @@ -79,7 +81,6 @@ Login
79 Input text xpath=//div[contains(@class, 'form-group col-sm-8')]//div[contains(@class, 'col-sm-2')]//input[@ng-model='data.tenderPeriod.endDate'] ${end_time} 81 Input text xpath=//div[contains(@class, 'form-group col-sm-8')]//div[contains(@class, 'col-sm-2')]//input[@ng-model='data.tenderPeriod.endDate'] ${end_time}
80 Sleep 2 82 Sleep 2
81 Click Element xpath=//div[contains(@class, 'col-sm-2')]//input[@data-target='#classification'] 83 Click Element xpath=//div[contains(@class, 'col-sm-2')]//input[@data-target='#classification']
82 - Wait Until Element Is Visible xpath=//div[contains(@role,'dialog')]  
83 Sleep 1 84 Sleep 1
84 Input text xpath=//div[contains(@class, 'modal-content')]//input[@ng-model='searchstring'] ${cpv} 85 Input text xpath=//div[contains(@class, 'modal-content')]//input[@ng-model='searchstring'] ${cpv}
85 Sleep 2 86 Sleep 2
@@ -88,24 +89,18 @@ Login @@ -88,24 +89,18 @@ Login
88 Sleep 1 89 Sleep 1
89 Click Element xpath=//div[contains(@class, 'modal-content')]//button[@ng-click='choose()'] 90 Click Element xpath=//div[contains(@class, 'modal-content')]//button[@ng-click='choose()']
90 Sleep 1 91 Sleep 1
91 - Click Element xpath=//div[contains(@class, 'col-sm-2')]//input[@data-target='#addClassification']  
92 - Wait Until Element Is Visible xpath=//div[contains(@id,'addClassification')]  
93 - Sleep 1  
94 - Input text xpath=//div[contains(@class, 'modal fade ng-scope in')]//input[@ng-model='searchstring'] ${dkpp_desc}  
95 - Wait Until Page Contains ${dkpp_id}  
96 - Sleep 1  
97 - Click Element xpath=//td[contains(., '${dkpp_id}')]  
98 - Click Element xpath=//div[contains(@class, 'modal fade ng-scope in')]//button[@ng-click='choose()']  
99 - Run Keyword if '${mode}' == 'multi' Додати предмет items 92 + Додати предмет ${items[0]} 0
  93 + Run Keyword if '${mode}' == 'multi' Додати багато предметів items
100 Sleep 1 94 Sleep 1
101 Wait Until Page Contains Element xpath=//div[contains(@class, 'form-actions')]//button[@type='submit'] 95 Wait Until Page Contains Element xpath=//div[contains(@class, 'form-actions')]//button[@type='submit']
102 Click Element xpath=//div[contains(@class, 'form-actions')]//button[@type='submit'] 96 Click Element xpath=//div[contains(@class, 'form-actions')]//button[@type='submit']
103 Sleep 1 97 Sleep 1
104 Wait Until Page Contains [ТЕСТУВАННЯ] 100 98 Wait Until Page Contains [ТЕСТУВАННЯ] 100
105 - Click Element xpath=//table[contains(@class, 'table table-hover table-striped table-bordered ng-scope ng-table')]//tr[1]//a 99 + Sleep 20
  100 + Click Element xpath=//*[text()='${title}']
106 Sleep 5 101 Sleep 5
107 ${tender_UAid}= Get Text xpath=//div[contains(@class, "panel-heading")] 102 ${tender_UAid}= Get Text xpath=//div[contains(@class, "panel-heading")]
108 - ${tender_UAid}= Get Substring ${tender_UAid} 7 103 + ${tender_UAid}= Get Substring ${tender_UAid} 10
109 ${Ids}= Convert To String ${tender_UAid} 104 ${Ids}= Convert To String ${tender_UAid}
110 Run keyword if '${mode}' == 'multi' Set Multi Ids ${ARGUMENTS[0]} ${tender_UAid} 105 Run keyword if '${mode}' == 'multi' Set Multi Ids ${ARGUMENTS[0]} ${tender_UAid}
111 [return] ${Ids} 106 [return] ${Ids}
@@ -113,9 +108,10 @@ Login @@ -113,9 +108,10 @@ Login
113 Set Multi Ids 108 Set Multi Ids
114 [Arguments] @{ARGUMENTS} 109 [Arguments] @{ARGUMENTS}
115 [Documentation] 110 [Documentation]
116 - ... ${ARGUMENTS[0]} == username  
117 - ${id}= Get Text xpath=//div[contains(@class, "panel-heading")]  
118 - ${Ids}= Create List ${tender_UAid} ${id} 111 + ... ${ARGUMENTS[0]} == ${tender_UAid}
  112 + ${current_location}= Get Location
  113 + ${id}= Get Substring ${current_location} 10
  114 + ${Ids}= Create List ${tender_UAid} ${id}
119 115
120 Oтримати internal id по UAid 116 Oтримати internal id по UAid
121 [Arguments] @{ARGUMENTS} 117 [Arguments] @{ARGUMENTS}
@@ -131,44 +127,28 @@ Oтримати internal id по UAid @@ -131,44 +127,28 @@ Oтримати internal id по UAid
131 [Arguments] @{ARGUMENTS} 127 [Arguments] @{ARGUMENTS}
132 [Documentation] 128 [Documentation]
133 ... ${ARGUMENTS[0]} == items 129 ... ${ARGUMENTS[0]} == items
134 - ${dkpp_desc1}= Get From Dictionary ${items[1].additionalClassifications[0]} description  
135 - ${dkpp_id1}= Get From Dictionary ${items[1].additionalClassifications[0]} id  
136 - ${dkpp_desc2}= Get From Dictionary ${items[2].additionalClassifications[0]} description  
137 - ${dkpp_id2}= Get From Dictionary ${items[2].additionalClassifications[0]} id  
138 - ${dkpp_desc3}= Get From Dictionary ${items[3].additionalClassifications[0]} description  
139 - ${dkpp_id3}= Get From Dictionary ${items[3].additionalClassifications[0]} id  
140 -  
141 - Wait Until Page Contains Element xpath=.//*[@id='myform']/tender-form/div/button 100  
142 - Sleep 2  
143 - Click Element xpath=.//*[@id='myform']/tender-form/div/button 130 + ... ${ARGUMENTS[1]} == ${INDEX}
  131 + ${dkpp_desc}= Get From Dictionary ${ARGUMENTS[0].additionalClassifications[0]} description
  132 + ${dkpp_id}= Get From Dictionary ${ARGUMENTS[0].additionalClassifications[0]} id
144 Sleep 2 133 Sleep 2
145 - Click Element xpath=(//div[contains(@class, 'col-sm-2')]//input[@data-target='#addClassification'])[2] 134 + Click Element xpath=(//div[contains(@class, 'col-sm-2')]//input[@data-target='#addClassification'])[${ARGUMENTS[1]}+1]
146 Wait Until Element Is Visible xpath=//div[contains(@id,'addClassification')] 135 Wait Until Element Is Visible xpath=//div[contains(@id,'addClassification')]
147 - Input text xpath=//div[contains(@class, 'modal fade ng-scope in')]//input[@ng-model='searchstring'] ${dkpp_desc1}  
148 - Wait Until Page Contains ${dkpp_id1}  
149 - Sleep 1  
150 - Click Element xpath=//td[contains(., '${dkpp_id1}')]  
151 - Click Element xpath=//div[contains(@class, 'modal fade ng-scope in')]//button[@ng-click='choose()']  
152 Sleep 2 136 Sleep 2
153 - Click Element xpath=.//*[@id='myform']/tender-form/div/button  
154 - Sleep 2  
155 - Click Element xpath=(//div[contains(@class, 'col-sm-2')]//input[@data-target='#addClassification'])[3]  
156 - Wait Until Element Is Visible xpath=//div[contains(@id,'addClassification')]  
157 - Input text xpath=//div[contains(@class, 'modal fade ng-scope in')]//input[@ng-model='searchstring'] ${dkpp_desc2}  
158 - Wait Until Page Contains ${dkpp_id2} 137 + Input text xpath=//div[contains(@class, 'modal fade ng-scope in')]//input[@ng-model='searchstring'] ${dkpp_desc}
  138 + Wait Until Page Contains ${dkpp_id}
159 Sleep 1 139 Sleep 1
160 - Click Element xpath=//td[contains(., '${dkpp_id2}')] 140 + Click Element xpath=//td[contains(., '${dkpp_id}')]
161 Click Element xpath=//div[contains(@class, 'modal fade ng-scope in')]//button[@ng-click='choose()'] 141 Click Element xpath=//div[contains(@class, 'modal fade ng-scope in')]//button[@ng-click='choose()']
162 Sleep 2 142 Sleep 2
163 - Click Element xpath=.//*[@id='myform']/tender-form/div/button  
164 - Sleep 2  
165 - Click Element xpath=(//div[contains(@class, 'col-sm-2')]//input[@data-target='#addClassification'])[4]  
166 - Wait Until Element Is Visible xpath=//div[contains(@id,'addClassification')]  
167 - Input text xpath=//div[contains(@class, 'modal fade ng-scope in')]//input[@ng-model='searchstring'] ${dkpp_desc3}  
168 - Wait Until Page Contains ${dkpp_id3}  
169 - Sleep 1  
170 - Click Element xpath=//td[contains(., '${dkpp_id3}')]  
171 - Click Element xpath=//div[contains(@class, 'modal fade ng-scope in')]//button[@ng-click='choose()'] 143 +
  144 +Додати багато предметів
  145 + [Arguments] @{ARGUMENTS}
  146 + [Documentation]
  147 + ... ${ARGUMENTS[0]} == items
  148 + ${Items_length}= Get Length ${items}
  149 + : FOR ${INDEX} IN RANGE 1 ${Items_length}
  150 + \ Click Element xpath=.//*[@id='myform']/tender-form/div/button
  151 + \ Додати предмет ${items[${INDEX}]} ${INDEX}
172 152
173 Пошук тендера по ідентифікатору 153 Пошук тендера по ідентифікатору
174 [Arguments] @{ARGUMENTS} 154 [Arguments] @{ARGUMENTS}
@@ -250,6 +230,61 @@ Oтримати internal id по UAid @@ -250,6 +230,61 @@ Oтримати internal id по UAid
250 Wait Until Page Contains ${ARGUMENTS[1]} 10 230 Wait Until Page Contains ${ARGUMENTS[1]} 10
251 sleep 1 231 sleep 1
252 232
  233 +Внести зміни в тендер
  234 + [Arguments] @{ARGUMENTS}
  235 + [Documentation]
  236 + ... ${ARGUMENTS[0]} = username
  237 + ... ${ARGUMENTS[1]} = ${TENDER_UAID}
  238 + ${ADDITIONAL_DATA}= prepare_test_tender_data ${BROKERS['${USERS.users['${tender_owner}'].broker}'].period_interval} single
  239 + ${tender_data}= Add_data_for_GUI_FrontEnds ${ADDITIONAL_DATA}
  240 + ${items}= Get From Dictionary ${tender_data.data} items
  241 + ${description}= Get From Dictionary ${tender_data.data} description
  242 + Selenium2Library.Switch Browser ${ARGUMENTS[0]}
  243 + etender.Пошук тендера по ідентифікатору ${ARGUMENTS[0]} ${ARGUMENTS[1]}
  244 + Wait Until Page Contains Element xpath=//a[@class='btn btn-primary ng-scope'] 10
  245 + Click Element xpath=//a[@class='btn btn-primary ng-scope']
  246 + Sleep 2
  247 + Input text id=description ${description}
  248 + Click Element xpath=//button[@class='btn btn-info ng-isolate-scope']
  249 + Capture Page Screenshot
  250 +
  251 +додати предмети закупівлі
  252 + [Arguments] @{ARGUMENTS}
  253 + [Documentation]
  254 + ... ${ARGUMENTS[0]} = username
  255 + ... ${ARGUMENTS[1]} = ${TENDER_UAID}
  256 + ... ${ARGUMENTS[2]} = 3
  257 + ${ADDITIONAL_DATA}= prepare_test_tender_data ${BROKERS['${USERS.users['${tender_owner}'].broker}'].period_interval} multi
  258 + ${tender_data}= Add_data_for_GUI_FrontEnds ${ADDITIONAL_DATA}
  259 + ${items}= Get From Dictionary ${tender_data.data} items
  260 + Selenium2Library.Switch Browser ${ARGUMENTS[0]}
  261 + Run keyword if '${TEST NAME}' == 'Можливість додати позицію закупівлі в тендер' додати позицію
  262 + Run keyword if '${TEST NAME}' != 'Можливість додати позицію закупівлі в тендер' видалити позиції
  263 +
  264 +додати позицію
  265 + etender.Пошук тендера по ідентифікатору ${ARGUMENTS[0]} ${ARGUMENTS[1]}
  266 + Sleep 2
  267 + Click Element xpath=//a[@class='btn btn-primary ng-scope']
  268 + Sleep 2
  269 + : FOR ${INDEX} IN RANGE 1 ${ARGUMENTS[2]} +1
  270 + \ Click Element xpath=.//*[@id='myform']/tender-form/div/button
  271 + \ Додати предмет ${items[${INDEX}]} ${INDEX}
  272 + Sleep 2
  273 + Click Element xpath=//div[@class='form-actions']/button[./text()='Зберегти зміни']
  274 + Wait Until Page Contains [ТЕСТУВАННЯ] 100
  275 +
  276 +видалити позиції
  277 + etender.Пошук тендера по ідентифікатору ${ARGUMENTS[0]} ${ARGUMENTS[1]}
  278 + Click Element xpath=//a[@class='btn btn-primary ng-scope']
  279 + Sleep 2
  280 + : FOR ${INDEX} IN RANGE 1 ${ARGUMENTS[2]} +1
  281 + \ Click Element xpath=(//button[@class='btn btn-danger ng-scope'])[last()]
  282 + \ Sleep 1
  283 + Sleep 2
  284 + Wait Until Page Contains Element xpath=//div[@class='form-actions']/button[./text()='Зберегти зміни'] 10
  285 + Click Element xpath=//div[@class='form-actions']/button[./text()='Зберегти зміни']
  286 + Wait Until Page Contains [ТЕСТУВАННЯ] 100
  287 +
253 отримати інформацію із тендера 288 отримати інформацію із тендера
254 [Arguments] @{ARGUMENTS} 289 [Arguments] @{ARGUMENTS}
255 [Documentation] 290 [Documentation]
@@ -257,15 +292,9 @@ Oтримати internal id по UAid @@ -257,15 +292,9 @@ Oтримати internal id по UAid
257 ... ${ARGUMENTS[1]} == fieldname 292 ... ${ARGUMENTS[1]} == fieldname
258 Switch browser ${ARGUMENTS[0]} 293 Switch browser ${ARGUMENTS[0]}
259 ${return_value}= run keyword отримати інформацію про ${ARGUMENTS[1]} 294 ${return_value}= run keyword отримати інформацію про ${ARGUMENTS[1]}
  295 + Log ${return_value}
260 [return] ${return_value} 296 [return] ${return_value}
261 297
262 -Відмітити на сторінці поле з тендера  
263 - [Arguments] ${fieldname} ${locator}  
264 - ${last_note_id}= Add pointy note ${locator} Found ${fieldname} width=200 position=bottom  
265 - Align elements horizontally ${locator} ${last_note_id}  
266 - sleep 1  
267 - Remove element ${last_note_id}  
268 -  
269 Отримати тест із поля і показати на сторінці 298 Отримати тест із поля і показати на сторінці
270 [Arguments] ${fieldname} 299 [Arguments] ${fieldname}
271 sleep 3 300 sleep 3
@@ -273,33 +302,41 @@ Oтримати internal id по UAid @@ -273,33 +302,41 @@ Oтримати internal id по UAid
273 ${return_value}= Get Text ${locator.${fieldname}} 302 ${return_value}= Get Text ${locator.${fieldname}}
274 [return] ${return_value} 303 [return] ${return_value}
275 304
276 -отримати інформацію про tenderId  
277 - ${return_value}= Отримати тест із поля і показати на сторінці tenderId  
278 - [return] ${return_value.split(' ')[1]}  
279 -  
280 отримати інформацію про title 305 отримати інформацію про title
281 ${return_value}= Отримати тест із поля і показати на сторінці title 306 ${return_value}= Отримати тест із поля і показати на сторінці title
282 [return] ${return_value} 307 [return] ${return_value}
283 308
284 отримати інформацію про description 309 отримати інформацію про description
285 - ${description}= Get text xpath=(//div[@class = 'col-sm-8'])[8]  
286 - [return] ${description} 310 + ${return_value}= Отримати тест із поля і показати на сторінці description
  311 + [return] ${return_value}
287 312
288 отримати інформацію про minimalStep.amount 313 отримати інформацію про minimalStep.amount
289 - ${step_rate}= Get text xpath=(//div[@class = 'col-sm-8'])[10]  
290 - ${step_rate}= Convert To Number ${step_rate.split(' ')[0]}  
291 - [return] ${step_rate} 314 + ${return_value}= Отримати тест із поля і показати на сторінці minimalStep.amount
  315 + ${return_value}= Convert To Number ${return_value.split(' ')[0]}
  316 + [return] ${return_value}
  317 +
  318 +отримати інформацію про value.amount
  319 + ${return_value}= Отримати тест із поля і показати на сторінці value.amount
  320 + ${return_value}= Evaluate "".join("${return_value}".split(' ')[:-3])
  321 + ${return_value}= Convert To Number ${return_value}
  322 + [return] ${return_value}
  323 +
  324 +Відмітити на сторінці поле з тендера
  325 + [Arguments] ${fieldname} ${locator}
  326 + ${last_note_id}= Add pointy note ${locator} Found ${fieldname} width=200 position=bottom
  327 + Align elements horizontally ${locator} ${last_note_id}
  328 + sleep 1
  329 + Remove element ${last_note_id}
  330 +
  331 +отримати інформацію про tenderId
  332 + ${return_value}= отримати тест із поля і показати на сторінці tenderId
  333 + ${return_value}= Get Substring ${return_value} 10
  334 + [return] ${return_value}
292 335
293 отримати інформацію про procuringEntity.name 336 отримати інформацію про procuringEntity.name
294 ${return_value}= Отримати тест із поля і показати на сторінці procuringEntity.name 337 ${return_value}= Отримати тест із поля і показати на сторінці procuringEntity.name
295 [return] ${return_value} 338 [return] ${return_value}
296 339
297 -отримати інформацію про value.amount  
298 - ${budget}= Get text xpath=(//div[@class = 'col-sm-8'])[9]  
299 - ${budget}= Evaluate "".join("${budget}".split(' ')[:-3])  
300 - ${budget}= Convert To Number ${budget}  
301 - [return] ${budget}  
302 -  
303 отримати інформацію про tenderPeriod.startDate 340 отримати інформацію про tenderPeriod.startDate
304 ${return_value}= Отримати тест із поля і показати на сторінці tenderPeriod.startDate 341 ${return_value}= Отримати тест із поля і показати на сторінці tenderPeriod.startDate
305 [return] ${return_value} 342 [return] ${return_value}
@@ -316,7 +353,6 @@ Oтримати internal id по UAid @@ -316,7 +353,6 @@ Oтримати internal id по UAid
316 ${return_value}= Отримати тест із поля і показати на сторінці enquiryPeriod.endDate 353 ${return_value}= Отримати тест із поля і показати на сторінці enquiryPeriod.endDate
317 [return] ${return_value} 354 [return] ${return_value}
318 355
319 -  
320 отримати інформацію про items[${item_id}].description 356 отримати інформацію про items[${item_id}].description
321 відмітити на сторінці поле з тендера items[${item_id}].description jquery=tender-subject-info.ng-isolate-scope>div.row:contains("Детальний опис предмету закупівлі:")>:eq(1)> 357 відмітити на сторінці поле з тендера items[${item_id}].description jquery=tender-subject-info.ng-isolate-scope>div.row:contains("Детальний опис предмету закупівлі:")>:eq(1)>
322 ${return_value}= Get Text jquery=tender-subject-info.ng-isolate-scope>div.row:contains("Детальний опис предмету закупівлі:")>:eq(1)> 358 ${return_value}= Get Text jquery=tender-subject-info.ng-isolate-scope>div.row:contains("Детальний опис предмету закупівлі:")>:eq(1)>
@@ -19,7 +19,7 @@ ${locator.tenderId} jquery=h3 @@ -19,7 +19,7 @@ ${locator.tenderId} jquery=h3
19 Set Window Size @{USERS.users['${ARGUMENTS[0]}'].size} 19 Set Window Size @{USERS.users['${ARGUMENTS[0]}'].size}
20 Set Window Position @{USERS.users['${ARGUMENTS[0]}'].position} 20 Set Window Position @{USERS.users['${ARGUMENTS[0]}'].position}
21 21
22 - sleep 10 22 +# sleep 10
23 Run Keyword If '${username}' != 'Newtend_Viewer' Login 23 Run Keyword If '${username}' != 'Newtend_Viewer' Login
24 24
25 Login 25 Login
@@ -30,9 +30,8 @@ Login @@ -30,9 +30,8 @@ Login
30 Input text id=password ${USERS.users['${username}'].password} 30 Input text id=password ${USERS.users['${username}'].password}
31 Click Element id=submit-login-button 31 Click Element id=submit-login-button
32 Wait Until Page Contains Element xpath =//a[@class="close-modal-dialog"] 20 32 Wait Until Page Contains Element xpath =//a[@class="close-modal-dialog"] 20
33 -  
34 -  
35 - Wait Until Page Contains Element xpath=//div[@class="introjs-overlay"] 20 33 + Go to ${USERS.users['${ARGUMENTS[0]}'].homepage}
  34 +# Wait Until Page Contains Element xpath=//div[@class="introjs-overlay"] 20
36 35
37 Створити тендер 36 Створити тендер
38 [Arguments] @{ARGUMENTS} 37 [Arguments] @{ARGUMENTS}
@@ -171,20 +170,17 @@ Set datetime @@ -171,20 +170,17 @@ Set datetime
171 [Documentation] 170 [Documentation]
172 ... ${ARGUMENTS[0]} == username 171 ... ${ARGUMENTS[0]} == username
173 ... ${ARGUMENTS[1]} == ${TENDER_UAID} 172 ... ${ARGUMENTS[1]} == ${TENDER_UAID}
174 - log ${USERS.users['${ARGUMENTS[0]}'].homepage}  
175 - log ${ARGUMENTS[0]}  
176 Switch browser ${ARGUMENTS[0]} 173 Switch browser ${ARGUMENTS[0]}
177 -# Go to ${USERS.users['${ARGUMENTS[0]}'].homepage} 174 + Go to ${USERS.users['${ARGUMENTS[0]}'].homepage}
178 Wait Until Page Contains Element xpath=//div[@class="search-field"]/input 20 175 Wait Until Page Contains Element xpath=//div[@class="search-field"]/input 20
179 - ${ARGUMENTS[1]}= Convert To String UA-2015-06-08-000023 176 +# ${ARGUMENTS[1]}= Convert To String UA-2015-06-08-000023
180 Input text xpath=//div[@class="search-field"]/input ${ARGUMENTS[1]} 177 Input text xpath=//div[@class="search-field"]/input ${ARGUMENTS[1]}
181 : FOR ${INDEX} IN RANGE 1 30 178 : FOR ${INDEX} IN RANGE 1 30
182 -# \ Log To Console .  
183 - \ sleep 1 179 + \ Log To Console . no_newline=true
  180 +# \ sleep 1
184 \ ${count}= Get Matching Xpath Count xpath=//a[@class="row tender-info ng-scope"] 181 \ ${count}= Get Matching Xpath Count xpath=//a[@class="row tender-info ng-scope"]
185 \ Exit For Loop If '${count}' == '1' 182 \ Exit For Loop If '${count}' == '1'
186 Click Element xpath=//a[@class="row tender-info ng-scope"] 183 Click Element xpath=//a[@class="row tender-info ng-scope"]
187 Wait Until Page Contains Element xpath=//a[@class="ng-binding ng-scope"] 30 184 Wait Until Page Contains Element xpath=//a[@class="ng-binding ng-scope"] 30
188 ${fould_title}= Get Text xpath=//a[@class="ng-binding ng-scope"] 185 ${fould_title}= Get Text xpath=//a[@class="ng-binding ng-scope"]
189 - Should Be Equal ${fould_title} ${ARGUMENTS[1]}  
190 - 186 + Should Be Equal ${fould_title} ${ARGUMENTS[1]}
@@ -83,7 +83,8 @@ ${telephone} +380976535447 @@ -83,7 +83,8 @@ ${telephone} +380976535447
83 Sleep 2 83 Sleep 2
84 Run Keyword if '${mode}' == 'multi' Додати предмет items 84 Run Keyword if '${mode}' == 'multi' Додати предмет items
85 Click Element id=mForm:bSave 85 Click Element id=mForm:bSave
86 - Sleep 5 86 + # More smart wait for id is needed there.
  87 + Sleep 25
87 ${tender_UAid}= Get Text id=mForm:nBid 88 ${tender_UAid}= Get Text id=mForm:nBid
88 ${tender_UAid}= Get Substring ${tender_UAid} 19 89 ${tender_UAid}= Get Substring ${tender_UAid} 19
89 ${Ids} Convert To String ${tender_UAid} 90 ${Ids} Convert To String ${tender_UAid}
@@ -17,7 +17,7 @@ users: @@ -17,7 +17,7 @@ users:
17 homepage: "http://uat.e-tender.biz/#/profile" 17 homepage: "http://uat.e-tender.biz/#/profile"
18 login: Misha2 18 login: Misha2
19 password: Password1 19 password: Password1
20 - browser: firefox 20 + browser: chrome
21 position: [0, 0] 21 position: [0, 0]
22 size: [800, 800] 22 size: [800, 800]
23 E-tender_Provider1: 23 E-tender_Provider1:
@@ -26,7 +26,7 @@ users: @@ -26,7 +26,7 @@ users:
26 homepage: "http://uat.e-tender.biz/#/profile" 26 homepage: "http://uat.e-tender.biz/#/profile"
27 login: st_org 27 login: st_org
28 password: 12345678 28 password: 12345678
29 - browser: firefox 29 + browser: chrome
30 position: [700, 0] 30 position: [700, 0]
31 size: [700, 800] 31 size: [700, 800]
32 E-tender_Provider2: 32 E-tender_Provider2:
@@ -35,7 +35,7 @@ users: @@ -35,7 +35,7 @@ users:
35 homepage: "http://uat.e-tender.biz/#/profile" 35 homepage: "http://uat.e-tender.biz/#/profile"
36 login: provider2 36 login: provider2
37 password: Qa123456 37 password: Qa123456
38 - browser: firefox 38 + browser: chrome
39 position: [700, 0] 39 position: [700, 0]
40 size: [640, 450] 40 size: [640, 450]
41 E-tender_Viewer: 41 E-tender_Viewer:
@@ -45,45 +45,6 @@ users: @@ -45,45 +45,6 @@ users:
45 browser: chrome 45 browser: chrome
46 position: [0, 0] 46 position: [0, 0]
47 size: [640, 450] 47 size: [640, 450]
48 - Prom_Owner:  
49 - broker: Prom  
50 - username: Promtest  
51 - browser: chrome  
52 - position: [0, 0]  
53 - size: [640, 450]  
54 - Prom_Viewer:  
55 - broker: Prom  
56 - username: Promtest  
57 - browser: chrome  
58 - position: [640, 0]  
59 - size: [640, 450]  
60 - SmartTender_Viewer:  
61 - broker: SmartTender  
62 - username: SmartTendertest  
63 - browser: chrome  
64 - position: [0, 450]  
65 - size: [640, 450]  
66 - Publicbid_Viewer:  
67 - broker: Publicbid  
68 - username: Publicbid  
69 - browser: chrome  
70 - position: [0, 450]  
71 - size: [640, 450]  
72 - Netcast_Viewer:  
73 - broker: Netcast  
74 - username: TetcastTest  
75 - browser: chrome  
76 - position: [0, 450]  
77 - size: [640, 450]  
78 - Newtend_Owner:  
79 - broker: Newtend  
80 - username: Newtendtest  
81 - homepage: "http://dev23.newtend.com/openprocurement/#/home/page/1"  
82 - login: openprocurement@mailinator.com  
83 - password: 123123  
84 - browser: firefox  
85 - position: [0, 0]  
86 - size: [1100, 1000]  
87 Netcast_Owner: 48 Netcast_Owner:
88 broker: Netcast 49 broker: Netcast
89 username: Netcasttest 50 username: Netcasttest
@@ -106,40 +67,65 @@ users: @@ -106,40 +67,65 @@ users:
106 broker: Netcast 67 broker: Netcast
107 username: Netcasttest 68 username: Netcasttest
108 homepage: "http://dz2.byustudio.in.ua" 69 homepage: "http://dz2.byustudio.in.ua"
109 - #browser: firefox  
110 browser: chrome 70 browser: chrome
  71 + #browser: chrome
111 position: [0, 0] 72 position: [0, 0]
112 size: [600, 800] 73 size: [600, 800]
113 - Publicbid_Owner:  
114 - broker: Publicbid  
115 - username: Publicbid  
116 - homepage: "https://public-bid.com.ua/test/"  
117 - login: yaroslav1boyko@gmail.com  
118 - password: Password1  
119 - browser: firefox  
120 - position: [0, 0]  
121 - size: [740, 550]  
122 Newtend_Owner: 74 Newtend_Owner:
123 broker: Newtend 75 broker: Newtend
124 username: Newtendtest 76 username: Newtendtest
125 homepage: "http://dev23.newtend.com/openprocurement/#/home/page/1" 77 homepage: "http://dev23.newtend.com/openprocurement/#/home/page/1"
126 login: openprocurement@mailinator.com 78 login: openprocurement@mailinator.com
127 password: 123123 79 password: 123123
128 - browser: firefox 80 + browser: chrome
129 position: [0, 0] 81 position: [0, 0]
130 - size: [640, 450]  
131 - Newtend_Provider2: 82 + size: [1000, 1100]
  83 + Newtend_Provider1:
132 broker: Newtend 84 broker: Newtend
133 username: Newtendtest 85 username: Newtendtest
134 homepage: "http://dev23.newtend.com/openprocurement/tenders" 86 homepage: "http://dev23.newtend.com/openprocurement/tenders"
135 login: openprocboss@mailinator.com 87 login: openprocboss@mailinator.com
136 password: 123123 88 password: 123123
137 - browser: firefox 89 + browser: chrome
138 position: [700, 0] 90 position: [700, 0]
139 - size: [640, 450] 91 + size: [800, 700]
140 Newtend_Viewer: 92 Newtend_Viewer:
141 broker: Newtend 93 broker: Newtend
142 username: Newtendtest 94 username: Newtendtest
143 - browser: firefox 95 + homepage: "http://dev23.newtend.com/openprocurement/tenders"
  96 + browser: chrome
  97 + position: [0, 0]
  98 + size: [640, 450]
  99 + Prom_Owner:
  100 + broker: Prom
  101 + username: Promtest
  102 + browser: chrome
144 position: [0, 0] 103 position: [0, 0]
145 - size: [640, 450]  
  104 + size: [640, 450]
  105 + Prom_Viewer:
  106 + broker: Prom
  107 + username: Promtest
  108 + browser: chrome
  109 + position: [640, 0]
  110 + size: [640, 450]
  111 + Publicbid_Owner:
  112 + broker: Publicbid
  113 + username: Publicbid
  114 + homepage: "https://public-bid.com.ua/test/"
  115 + login: yaroslav1boyko@gmail.com
  116 + password: Password1
  117 + browser: chrome
  118 + position: [0, 0]
  119 + size: [740, 550]
  120 + Publicbid_Viewer:
  121 + broker: Publicbid
  122 + username: Publicbid
  123 + browser: chrome
  124 + position: [0, 450]
  125 + size: [640, 450]
  126 + SmartTender_Viewer:
  127 + broker: SmartTender
  128 + username: SmartTendertest
  129 + browser: chrome
  130 + position: [0, 450]
  131 + size: [640, 450]
Please register or login to post a comment