Alex / prozorro-robot_tests · Commits

Commit 98fd711270c2eb8440861066992b3a22bfc2d5c3

Authored by selurvedu
1 parent 9d2f1055

Adapt brokers' keyword files

Inline Side-by-side
Showing 5 changed files with 32 additions and 18 deletions
@@ -201,7 +201,8 @@ Set Multi Ids @@ -201,7 +201,8 @@ Set Multi Ids
201 ... ${ARGUMENTS[0]} == username 201 ... ${ARGUMENTS[0]} == username
202 ... ${ARGUMENTS[1]} == ${TENDER_UAID} 202 ... ${ARGUMENTS[1]} == ${TENDER_UAID}
203 Switch browser ${ARGUMENTS[0]} 203 Switch browser ${ARGUMENTS[0]}
204 - Go to ${BROKERS['${USERS.users['${username}'].broker}'].url} 204 + ${url}= Get Broker Property By Username ${ARGUMENTS[0]} url
  205 + Go To ${url}
205 Wait Until Page Contains Прозорі закупівлі 10 206 Wait Until Page Contains Прозорі закупівлі 10
206 sleep 1 207 sleep 1
207 Input Text jquery=input[ng-change='searchChange()'] ${ARGUMENTS[1]} 208 Input Text jquery=input[ng-change='searchChange()'] ${ARGUMENTS[1]}
@@ -311,7 +312,8 @@ Set Multi Ids @@ -311,7 +312,8 @@ Set Multi Ids
311 [Documentation] 312 [Documentation]
312 ... ${ARGUMENTS[0]} = username 313 ... ${ARGUMENTS[0]} = username
313 ... ${ARGUMENTS[1]} = ${TENDER_UAID} 314 ... ${ARGUMENTS[1]} = ${TENDER_UAID}
314 - ${ADDITIONAL_DATA}= prepare_test_tender_data ${BROKERS['${USERS.users['${tender_owner}'].broker}'].period_interval} single 315 + ${period_interval}= Get Broker Property By Username ${ARGUMENTS[0]} period_interval
  316 + ${ADDITIONAL_DATA}= prepare_test_tender_data ${period_interval} single
315 ${tender_data}= Add_data_for_GUI_FrontEnds ${ADDITIONAL_DATA} 317 ${tender_data}= Add_data_for_GUI_FrontEnds ${ADDITIONAL_DATA}
316 ${items}= Get From Dictionary ${tender_data.data} items 318 ${items}= Get From Dictionary ${tender_data.data} items
317 ${description}= Get From Dictionary ${tender_data.data} description 319 ${description}= Get From Dictionary ${tender_data.data} description
@@ -330,7 +332,8 @@ Set Multi Ids @@ -330,7 +332,8 @@ Set Multi Ids
330 ... ${ARGUMENTS[0]} = username 332 ... ${ARGUMENTS[0]} = username
331 ... ${ARGUMENTS[1]} = ${TENDER_UAID} 333 ... ${ARGUMENTS[1]} = ${TENDER_UAID}
332 ... ${ARGUMENTS[2]} = 3 334 ... ${ARGUMENTS[2]} = 3
333 - ${ADDITIONAL_DATA}= prepare_test_tender_data ${BROKERS['${USERS.users['${tender_owner}'].broker}'].period_interval} multi 335 + ${period_interval}= Get Broker Property By Username ${ARGUMENTS[0]} period_interval
  336 + ${ADDITIONAL_DATA}= prepare_test_tender_data ${period_interval} multi
334 ${tender_data}= Add_data_for_GUI_FrontEnds ${ADDITIONAL_DATA} 337 ${tender_data}= Add_data_for_GUI_FrontEnds ${ADDITIONAL_DATA}
335 ${items}= Get From Dictionary ${tender_data.data} items 338 ${items}= Get From Dictionary ${tender_data.data} items
336 Selenium2Library.Switch Browser ${ARGUMENTS[0]} 339 Selenium2Library.Switch Browser ${ARGUMENTS[0]}
@@ -31,7 +31,8 @@ ${locator.questions[0].answer} xpath=//div[@class = 'answer relative']//di @@ -31,7 +31,8 @@ ${locator.questions[0].answer} xpath=//div[@class = 'answer relative']//di
31 [Arguments] @{ARGUMENTS} 31 [Arguments] @{ARGUMENTS}
32 [Documentation] Відкрити брaузер, створити обєкт api wrapper, тощо 32 [Documentation] Відкрити брaузер, створити обєкт api wrapper, тощо
33 ... ${ARGUMENTS[0]} == username 33 ... ${ARGUMENTS[0]} == username
34 - Open Browser ${BROKERS['${USERS.users['${ARGUMENTS[0]}'].broker}'].url} ${USERS.users['${ARGUMENTS[0]}'].browser} alias=${ARGUMENTS[0]} 34 + ${url}= Get Broker Property By Username ${ARGUMENTS[0]} url
  35 + Open Browser ${url} ${USERS.users['${ARGUMENTS[0]}'].browser} alias=${ARGUMENTS[0]}
35 Set Window Size @{USERS.users['${ARGUMENTS[0]}'].size} 36 Set Window Size @{USERS.users['${ARGUMENTS[0]}'].size}
36 Set Window Position @{USERS.users['${ARGUMENTS[0]}'].position} 37 Set Window Position @{USERS.users['${ARGUMENTS[0]}'].position}
37 Run Keyword And Ignore Error Pre Login ${ARGUMENTS[0]} 38 Run Keyword And Ignore Error Pre Login ${ARGUMENTS[0]}
@@ -53,10 +54,12 @@ Pre Login @@ -53,10 +54,12 @@ Pre Login
53 [Arguments] @{ARGUMENTS} 54 [Arguments] @{ARGUMENTS}
54 [Documentation] 55 [Documentation]
55 ... ${ARGUMENTS[0]} == username 56 ... ${ARGUMENTS[0]} == username
56 - Wait Until Page Contains Element name=siteLogin 10  
57 - Input text name=siteLogin ${BROKERS['${USERS.users['${username}'].broker}'].login}  
58 - Input text name=sitePass ${BROKERS['${USERS.users['${username}'].broker}'].password}  
59 - Click Button xpath=.//*[@id='table1']/tbody/tr/td/form/p[3]/input 57 + ${login}= Get Broker Property By Username ${ARGUMENTS[0]} login
  58 + ${password}= Get Broker Property By Username ${ARGUMENTS[0]} password
  59 + Wait Until Page Contains Element name=siteLogin 10
  60 + Input Text name=siteLogin ${login}
  61 + Input Text name=sitePass ${password}
  62 + Click Button xpath=.//*[@id='table1']/tbody/tr/td/form/p[3]/input
60 63
61 Створити тендер 64 Створити тендер
62 [Arguments] @{ARGUMENTS} 65 [Arguments] @{ARGUMENTS}
@@ -187,7 +190,8 @@ Set Multi Ids @@ -187,7 +190,8 @@ Set Multi Ids
187 ... ${ARGUMENTS[0]} = username 190 ... ${ARGUMENTS[0]} = username
188 ... ${ARGUMENTS[1]} = ${TENDER_UAID} 191 ... ${ARGUMENTS[1]} = ${TENDER_UAID}
189 ... ${ARGUMENTS[2]} = 3 192 ... ${ARGUMENTS[2]} = 3
190 - ${tender_data}= prepare_test_tender_data ${BROKERS['${USERS.users['${tender_owner}'].broker}'].period_interval} multi 193 + ${period_interval}= Get Broker Property By Username ${ARGUMENTS[0]} period_interval
  194 + ${tender_data}= prepare_test_tender_data ${period_interval} multi
191 195
192 ${items}= Get From Dictionary ${tender_data.data} items 196 ${items}= Get From Dictionary ${tender_data.data} items
193 ${description}= Get From Dictionary ${tender_data.data} description 197 ${description}= Get From Dictionary ${tender_data.data} description
@@ -229,7 +233,8 @@ Set Multi Ids @@ -229,7 +233,8 @@ Set Multi Ids
229 ... ${ARGUMENTS[0]} == username 233 ... ${ARGUMENTS[0]} == username
230 ... ${ARGUMENTS[1]} == tenderId 234 ... ${ARGUMENTS[1]} == tenderId
231 Switch browser ${ARGUMENTS[0]} 235 Switch browser ${ARGUMENTS[0]}
232 - Go to ${BROKERS['${USERS.users['${username}'].broker}'].url} 236 + ${url}= Get Broker Property By Username ${ARGUMENTS[0]} url
  237 + Go To ${url}
233 Wait Until Page Contains Держзакупівлі.онлайн 10 238 Wait Until Page Contains Держзакупівлі.онлайн 10
234 Click Element xpath=//a[text()='Закупівлі'] 239 Click Element xpath=//a[text()='Закупівлі']
235 sleep 1 240 sleep 1
@@ -42,7 +42,8 @@ ${locator.QUESTIONS[0].date} xpath=//span[@class="date ng-binding"] @@ -42,7 +42,8 @@ ${locator.QUESTIONS[0].date} xpath=//span[@class="date ng-binding"]
42 [Arguments] @{ARGUMENTS} 42 [Arguments] @{ARGUMENTS}
43 [Documentation] Відкрити брaвзер, створити обєкт api wrapper, тощо 43 [Documentation] Відкрити брaвзер, створити обєкт api wrapper, тощо
44 ... ${ARGUMENTS[0]} == username 44 ... ${ARGUMENTS[0]} == username
45 - Open Browser ${BROKERS['${USERS.users['${username}'].broker}'].url} ${USERS.users['${username}'].browser} alias=${ARGUMENTS[0]} 45 + ${url}= Get Broker Property By Username ${ARGUMENTS[0]} url
  46 + Open Browser ${url} ${USERS.users['${username}'].browser} alias=${ARGUMENTS[0]}
46 Set Window Size @{USERS.users['${ARGUMENTS[0]}'].size} 47 Set Window Size @{USERS.users['${ARGUMENTS[0]}'].size}
47 Set Window Position @{USERS.users['${ARGUMENTS[0]}'].position} 48 Set Window Position @{USERS.users['${ARGUMENTS[0]}'].position}
48 Run Keyword If '${username}' != 'Newtend_Viewer' Login 49 Run Keyword If '${username}' != 'Newtend_Viewer' Login
@@ -400,7 +401,8 @@ Set datetime @@ -400,7 +401,8 @@ Set datetime
400 ... ${ARGUMENTS[0]} = username 401 ... ${ARGUMENTS[0]} = username
401 ... ${ARGUMENTS[1]} = ${TENDER_UAID} 402 ... ${ARGUMENTS[1]} = ${TENDER_UAID}
402 ... ${ARGUMENTS[2]} = 3 403 ... ${ARGUMENTS[2]} = 3
403 - ${ADDITIONAL_DATA}= prepare_test_tender_data ${BROKERS['${USERS.users['${tender_owner}'].broker}'].period_interval} multi 404 + ${period_interval}= Get Broker Property By Username ${ARGUMENTS[0]} period_interval
  405 + ${ADDITIONAL_DATA}= prepare_test_tender_data ${period_interval} multi
404 ${items}= Get From Dictionary ${ADDITIONAL_DATA.data} items 406 ${items}= Get From Dictionary ${ADDITIONAL_DATA.data} items
405 Selenium2Library.Switch Browser ${ARGUMENTS[0]} 407 Selenium2Library.Switch Browser ${ARGUMENTS[0]}
406 Wait Until Page Contains Element ${locator.edit_tender} 10 408 Wait Until Page Contains Element ${locator.edit_tender} 10
@@ -21,7 +21,8 @@ ${PASSWORD} 1234 @@ -21,7 +21,8 @@ ${PASSWORD} 1234
21 log many @{ARGUMENTS} 21 log many @{ARGUMENTS}
22 log ${username} 22 log ${username}
23 [Documentation] Відкрити брaвзер, створити обєкт api wrapper, тощо 23 [Documentation] Відкрити брaвзер, створити обєкт api wrapper, тощо
24 - Open Browser ${BROKERS['${USERS.users['${username}'].broker}'].url} ${USERS.users['${username}'].browser} alias=${username} 24 + ${url}= Get Broker Property By Username ${ARGUMENTS[0]} url
  25 + Open Browser ${url} ${USERS.users['${username}'].browser} alias=${username}
25 Set Window Position @{USERS.users['${username}'].position} 26 Set Window Position @{USERS.users['${username}'].position}
26 #Set Window Size @{USERS.users['${username}'].size} 27 #Set Window Size @{USERS.users['${username}'].size}
27 Log Variables 28 Log Variables
@@ -99,8 +100,9 @@ Get tender id @@ -99,8 +100,9 @@ Get tender id
99 ... ${ARGUMENTS[2]} == id 100 ... ${ARGUMENTS[2]} == id
100 Switch browser ${ARGUMENTS[0]} 101 Switch browser ${ARGUMENTS[0]}
101 ${current_location}= Get Location 102 ${current_location}= Get Location
102 - Run keyword if '${BROKERS['${USERS.users['${username}'].broker}'].url}/#/tenderDetailes/${ARGUMENTS[2]}'=='${current_location}' Reload Page  
103 - Go to ${BROKERS['${USERS.users['${username}'].broker}'].url} 103 + ${url}= Get Broker Property By Username ${ARGUMENTS[0]} url
  104 + Run Keyword If '${url}/#/tenderDetailes/${ARGUMENTS[2]}'=='${current_location}' Reload Page
  105 + Go to ${url}
104 Wait Until Page Contains Допороговые закупки Украины 10 106 Wait Until Page Contains Допороговые закупки Украины 10
105 sleep 1 107 sleep 1
106 Input Text id=search ${ARGUMENTS[1]} 108 Input Text id=search ${ARGUMENTS[1]}
@@ -7,7 +7,8 @@ Library DateTime @@ -7,7 +7,8 @@ Library DateTime
7 Підготувати клієнт для користувача 7 Підготувати клієнт для користувача
8 [Arguments] ${username} 8 [Arguments] ${username}
9 [Documentation] Відкрити брaвзер, створити обєкт api wrapper, тощо 9 [Documentation] Відкрити брaвзер, створити обєкт api wrapper, тощо
10 - Open Browser ${BROKERS['${USERS.users['${username}'].broker}'].url} ${USERS.users['${username}'].browser} alias=${username} 10 + ${url}= Get Broker Property By Username ${username} url
  11 + Open Browser ${url} ${USERS.users['${username}'].browser} alias=${username}
11 Set Window Position @{USERS.users['${username}'].position} 12 Set Window Position @{USERS.users['${username}'].position}
12 Set Window Size @{USERS.users['${username}'].size} 13 Set Window Size @{USERS.users['${username}'].size}
13 Log Variables 14 Log Variables
@@ -20,8 +21,9 @@ Library DateTime @@ -20,8 +21,9 @@ Library DateTime
20 ... ${ARGUMENTS[2]} == id 21 ... ${ARGUMENTS[2]} == id
21 Switch browser ${ARGUMENTS[0]} 22 Switch browser ${ARGUMENTS[0]}
22 ${current_location}= Get Location 23 ${current_location}= Get Location
23 - Run keyword if '${BROKERS['${USERS.users['${username}'].broker}'].url}/#/tenderDetailes/${ARGUMENTS[2]}'=='${current_location}' Reload Page  
24 - Go to ${BROKERS['${USERS.users['${username}'].broker}'].url} 24 + ${url}= Get Broker Property By Username ${ARGUMENTS[0]} url
  25 + Run Keyword If '${url}/#/tenderDetailes/${ARGUMENTS[2]}'=='${current_location}' Reload Page
  26 + Go To ${url}
25 Wait Until Page Contains Офіційний майданчик державних закупівель України 10 27 Wait Until Page Contains Офіційний майданчик державних закупівель України 10
26 sleep 1 28 sleep 1
27 Input Text id=j_idt18:datalist:j_idt67 ${ARGUMENTS[1]} 29 Input Text id=j_idt18:datalist:j_idt67 ${ARGUMENTS[1]}
Please register or login to post a comment