Alex / prozorro-robot_tests · Commits

Commit 921239b83078802a2791d613674f3ebd4dc6ee12

Authored by biviktorqc
2 parents 1cfdd4a9 ce5122ed

Merge branch 'pc2' of git://github.com/yboi/robot_tests into pc2y

Inline Side-by-side
Showing 3 changed files with 32 additions and 17 deletions
... ... @@ -53,9 +53,11 @@ ${file_path} /home/yboi/openprocurement.robottests.buildout/Document.docx
53 53 ${enquiry_end_time}= Get From Dictionary ${prepared_tender_data.data.enquiryPeriod} endDate
54 54 ${enquiry_end_time}= convert_time_to_etender_format ${enquiry_end_time}
55 55 Selenium2Library.Switch Browser ${ARGUMENTS[0]}
56   - Wait Until Page Contains Мої закупівлі 100
  56 + Wait Until Page Contains Мої закупівлі 100
  57 + Sleep 1
57 58 Click Element xpath=//a[contains(@class, 'ng-binding')][./text()='Мої закупівлі']
58 59 Wait Until Page Contains Element xpath=//a[contains(@class, 'btn btn-info')]
  60 + Sleep 1
59 61 Click Element xpath=//a[contains(@class, 'btn btn-info')]
60 62 Wait Until Page Contains Element id=title
61 63 Input text id=title ${title}
... ... @@ -65,7 +67,7 @@ ${file_path} /home/yboi/openprocurement.robottests.buildout/Document.docx
65 67 Input text id=minimalStep ${step_rate}
66 68 Input text id=itemsDescription ${items_description}
67 69 Input text id=itemsQuantity ${quantity}
68   - Wait Until Page Contains Element xpath=//select[@name="itemsUnit"]/option[@value='kilogram'] 100
  70 + Wait Until Page Contains Element xpath=//select[@name="itemsUnit"]/option[@value='kilogram']
69 71 Click Element xpath=//select[@name="itemsUnit"]/option[@value='kilogram']
70 72 Input text xpath=//div[contains(@class, 'form-group col-sm-8')]//input[@name='enqPEndDate'] ${enquiry_end_date}
71 73 Input text xpath=//div[contains(@class, 'form-group col-sm-8')]//div[contains(@class, 'col-sm-2')]//input[@ng-model='data.enquiryPeriod.endDate'] ${enquiry_end_time}
... ... @@ -73,21 +75,30 @@ ${file_path} /home/yboi/openprocurement.robottests.buildout/Document.docx
73 75 Input text xpath=//div[contains(@class, 'form-group col-sm-8')]//div[contains(@class, 'col-sm-2')]//input[@ng-model='data.tenderPeriod.startDate'] ${start_time}
74 76 Input text xpath=//div[contains(@class, 'form-group col-sm-8')]//input[@name='endDate'] ${end_date}
75 77 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}
  78 + Sleep 2
76 79 Click Element xpath=//div[contains(@class, 'col-sm-2')]//input[@data-target='#classification']
77 80 Wait Until Element Is Visible xpath=//div[contains(@role,'dialog')]
  81 + Sleep 1
78 82 Input text xpath=//div[contains(@class, 'modal-content')]//input[@ng-model='searchstring'] ${cpv}
  83 + Sleep 2
79 84 Wait Until Page Contains ${cpv}
80 85 Click Element xpath=//td[contains(., '${cpv}')]
  86 + Sleep 1
81 87 Click Element xpath=//div[contains(@class, 'modal-content')]//button[@ng-click='choose()']
  88 + Sleep 1
82 89 Click Element xpath=//div[contains(@class, 'col-sm-2')]//input[@data-target='#addClassification']
83 90 Wait Until Element Is Visible xpath=//div[contains(@id,'addClassification')]
  91 + Sleep 1
84 92 Input text xpath=//div[contains(@class, 'modal fade ng-scope in')]//input[@ng-model='searchstring'] ${dkpp_desc}
85 93 Wait Until Page Contains ${dkpp_id}
  94 + Sleep 1
86 95 Click Element xpath=//td[contains(., '${dkpp_id}')]
87 96 Click Element xpath=//div[contains(@class, 'modal fade ng-scope in')]//button[@ng-click='choose()']
88 97 Run Keyword if '${mode}' == 'multi' Додати предмет items
  98 + Sleep 1
89 99 Wait Until Page Contains Element xpath=//div[contains(@class, 'form-actions')]//button[@type='submit']
90 100 Click Element xpath=//div[contains(@class, 'form-actions')]//button[@type='submit']
  101 + Sleep 1
91 102 Wait Until Page Contains [ТЕСТУВАННЯ] 100
92 103 Click Element xpath=//table[contains(@class, 'table table-hover table-striped table-bordered ng-scope ng-table')]//tr[1]//a
93 104 Sleep 5
... ... @@ -116,12 +127,14 @@ Set Multi Ids
116 127 ${dkpp_id3}= Get From Dictionary ${items[3].additionalClassifications[0]} id
117 128
118 129 Wait Until Page Contains Element xpath=.//*[@id='myform']/tender-form/div/button 100
  130 + Sleep 2
119 131 Click Element xpath=.//*[@id='myform']/tender-form/div/button
120 132 Sleep 2
121 133 Click Element xpath=(//div[contains(@class, 'col-sm-2')]//input[@data-target='#addClassification'])[2]
122 134 Wait Until Element Is Visible xpath=//div[contains(@id,'addClassification')]
123 135 Input text xpath=//div[contains(@class, 'modal fade ng-scope in')]//input[@ng-model='searchstring'] ${dkpp_desc1}
124 136 Wait Until Page Contains ${dkpp_id1}
  137 + Sleep 1
125 138 Click Element xpath=//td[contains(., '${dkpp_id1}')]
126 139 Click Element xpath=//div[contains(@class, 'modal fade ng-scope in')]//button[@ng-click='choose()']
127 140 Sleep 2
... ... @@ -131,6 +144,7 @@ Set Multi Ids
131 144 Wait Until Element Is Visible xpath=//div[contains(@id,'addClassification')]
132 145 Input text xpath=//div[contains(@class, 'modal fade ng-scope in')]//input[@ng-model='searchstring'] ${dkpp_desc2}
133 146 Wait Until Page Contains ${dkpp_id2}
  147 + Sleep 1
134 148 Click Element xpath=//td[contains(., '${dkpp_id2}')]
135 149 Click Element xpath=//div[contains(@class, 'modal fade ng-scope in')]//button[@ng-click='choose()']
136 150 Sleep 2
... ... @@ -140,6 +154,7 @@ Set Multi Ids
140 154 Wait Until Element Is Visible xpath=//div[contains(@id,'addClassification')]
141 155 Input text xpath=//div[contains(@class, 'modal fade ng-scope in')]//input[@ng-model='searchstring'] ${dkpp_desc3}
142 156 Wait Until Page Contains ${dkpp_id3}
  157 + Sleep 1
143 158 Click Element xpath=//td[contains(., '${dkpp_id3}')]
144 159 Click Element xpath=//div[contains(@class, 'modal fade ng-scope in')]//button[@ng-click='choose()']
145 160
... ... @@ -255,24 +270,23 @@ Set Multi Ids
255 270 [return] ${return_value}
256 271
257 272 отримати інформацію про description
258   - ${return_value}= Отримати тест із поля і показати на сторінці description
259   - [return] ${return_value}
  273 + ${description}= Get text xpath=(//div[@class = 'col-sm-8'])[8]
  274 + [return] ${description}
260 275
261 276 отримати інформацію про minimalStep.amount
262   - ${return_value}= Отримати тест із поля і показати на сторінці minimalStep.amount
263   - ${return_value}= Convert To Number ${return_value.split(' ')[0]}
264   - [return] ${return_value}
  277 + ${step_rate}= Get text xpath=(//div[@class = 'col-sm-8'])[10]
  278 + ${step_rate}= Convert To Number ${step_rate.split(' ')[0]}
  279 + [return] ${step_rate}
265 280
266 281 отримати інформацію про procuringEntity.name
267 282 ${return_value}= Отримати тест із поля і показати на сторінці procuringEntity.name
268 283 [return] ${return_value}
269 284
270   -
271 285 отримати інформацію про value.amount
272   - ${return_value}= Отримати тест із поля і показати на сторінці value.amount
273   - ${return_value}= Evaluate "".join("${return_value}".split(' ')[:-3])
274   - ${return_value}= Convert To Number ${return_value}
275   - [return] ${return_value}
  286 + ${budget}= Get text xpath=(//div[@class = 'col-sm-8'])[9]
  287 + ${budget}= Evaluate "".join("${budget}".split(' ')[:-3])
  288 + ${budget}= Convert To Number ${budget}
  289 + [return] ${budget}
276 290
277 291 отримати інформацію про tenderPeriod.startDate
278 292 ${return_value}= Отримати тест із поля і показати на сторінці tenderPeriod.startDate
... ...
... ... @@ -6,7 +6,7 @@ Library DateTime
6 6 *** Variables ***
7 7 ##Використовую такий шлях у кожного буде мінятись /yboi/. Міняйте на сві шлях до файлу
8 8 #${file_path} /home/yboi/openprocurement.robottests.buildout/Document.docx
9   -${file_path} /home/vbilos/openprocurement.robottests.buildout/Document.docx
  9 +${file_path} /home/yboi/openprocurement.robottests.buildout/Document.docx
10 10 ${mail} test@mail.com
11 11 ${telephone} +380976535447
12 12
... ... @@ -24,6 +24,7 @@ ${telephone} +380976535447
24 24 Click Element id=mForm:j_idt54
25 25 Run Keyword And Ignore Error Wait Until Page Contains Element id=mForm:email 10
26 26 Input text id=mForm:email ${USERS.users['${username}'].login}
  27 + Sleep 2
27 28 Input text id=mForm:pwd ${USERS.users['${username}'].password}
28 29 Click Button id=mForm:login
29 30
... ... @@ -80,6 +81,7 @@ ${telephone} +380976535447
80 81 Input text id=mForm:data:rPhone ${telephone}
81 82 Input text id=mForm:data:rMail ${mail}
82 83 Choose File id=mForm:data:docFile_input ${file_path}
  84 + Sleep 2
83 85 Run Keyword if '${mode}' == 'multi' Додати предмет items
84 86 Click Element id=mForm:bSave
85 87 Sleep 5
... ... @@ -150,7 +152,6 @@ Set Multi Ids
150 152 Wait Until Page Contains Element xpath=//div[@id='mForm:data:cDkpp3_panel']/table/tbody/tr/td[1]/span 10
151 153 Click Element xpath=//div[@id='mForm:data:cDkpp3_panel']/table/tbody/tr/td[1]/span
152 154
153   -
154 155 Пошук тендера по ідентифікатору
155 156 [Arguments] @{ARGUMENTS}
156 157 [Documentation]
... ...
... ... @@ -17,8 +17,8 @@ users:
17 17 homepage: "http://uat.e-tender.biz/#/profile"
18 18 login: Misha2
19 19 password: Password1
20   - browser: firefox
21   - position: [0, 0]
  20 + browser: chrome
  21 + position: [0, 1000]
22 22 size: [740, 550]
23 23 E-tender_Provider1:
24 24 broker: E-tender
... ... @@ -107,7 +107,7 @@ users:
107 107 homepage: "https://public-bid.com.ua/test/"
108 108 login: yaroslav1boyko@gmail.com
109 109 password: Password1
110   - browser: firefox
  110 + browser: chrome
111 111 position: [0, 0]
112 112 size: [740, 550]
113 113 Newtend_Provider2:
... ...
Please register or login to post a comment