Showing
2 changed files
with
102 additions
and
13 deletions
... | ... | @@ -114,8 +114,11 @@ ${locator.tenderId} jquery=h3 |
114 | 114 | Click Element xpath=//div[@ng-click="goHome()"] |
115 | 115 | ### harcode Idis bacause issues on the Newtend side, to remove after fix: |
116 | 116 | ${tender_UAid}= Convert To String UA-2015-07-06-000105 |
117 | + ${tender_id}= Convert To String 192c86c7d8b74c1081d1a9b2db0faba2 | |
118 | + | |
117 | 119 | ### ${tender_UAid}= Get Text xpath=//div[@class="title"] |
118 | - ${Ids} Create List ${tender_UAid} | |
120 | + | |
121 | + ${Ids} Create List ${tender_UAid} ${tender_id} | |
119 | 122 | [return] ${Ids} |
120 | 123 | |
121 | 124 | Set datetime |
... | ... | @@ -143,16 +146,98 @@ Set datetime |
143 | 146 | [Documentation] |
144 | 147 | ... ${ARGUMENTS[0]} == items |
145 | 148 | |
146 | -## Get values | |
147 | - | |
148 | - Click Element xpath=//a[@class="icon-black plus-black remove-field ng-scope"] | |
149 | +## Get values for 2-nd item | |
150 | + ${items_description1}= Get From Dictionary ${items[1]} description | |
151 | + ${quantity1}= Get From Dictionary ${items[1]} quantity | |
152 | + ${cpv1}= Get From Dictionary ${items[1].classification} description_ua | |
153 | + ${dkpp_desc1}= Get From Dictionary ${items[1].additionalClassifications[0]} description | |
154 | + ${dkpp_id1}= Get From Dictionary ${items[1].additionalClassifications[0]} id | |
155 | + ${unit1}= Get From Dictionary ${items[1].unit} name | |
156 | + | |
157 | + ${deliverydate_end_date1}= Get From Dictionary ${items[1].deliveryDate} endDate | |
158 | + | |
159 | + ${countryName1}= Get From Dictionary ${items[1].deliveryAddress} countryName | |
160 | + ${ZIP1}= Get From Dictionary ${items[1].deliveryAddress} postalCode | |
161 | + ${region1}= Get From Dictionary ${items[1].deliveryAddress} region | |
162 | + ${locality1}= Get From Dictionary ${items[1].deliveryAddress} locality | |
163 | + ${streetAddress1}= Get From Dictionary ${items[1].deliveryAddress} streetAddress | |
164 | + | |
165 | +## Get values for 3-rd item | |
166 | + ${items_description2}= Get From Dictionary ${items[2]} description | |
167 | + ${quantity2}= Get From Dictionary ${items[2]} quantity | |
168 | + ${cpv2}= Get From Dictionary ${items[2].classification} description_ua | |
169 | + ${dkpp_desc2}= Get From Dictionary ${items[2].additionalClassifications[0]} description | |
170 | + ${dkpp_id2}= Get From Dictionary ${items[2].additionalClassifications[0]} id | |
171 | + ${unit2}= Get From Dictionary ${items[2].unit} name | |
172 | + | |
173 | + ${deliverydate_end_date2}= Get From Dictionary ${items[2].deliveryDate} endDate | |
174 | + | |
175 | + ${countryName2}= Get From Dictionary ${items[2].deliveryAddress} countryName | |
176 | + ${ZIP2}= Get From Dictionary ${items[2].deliveryAddress} postalCode | |
177 | + ${region2}= Get From Dictionary ${items[2].deliveryAddress} region | |
178 | + ${locality2}= Get From Dictionary ${items[2].deliveryAddress} locality | |
179 | + ${streetAddress2}= Get From Dictionary ${items[2].deliveryAddress} streetAddress | |
180 | + | |
181 | +## Get values for 4-th item | |
182 | + ${items_description3}= Get From Dictionary ${items[3]} description | |
183 | + ${quantity3}= Get From Dictionary ${items[3]} quantity | |
184 | + ${cpv3}= Get From Dictionary ${items[3].classification} description_ua | |
185 | + ${dkpp_desc3}= Get From Dictionary ${items[3].additionalClassifications[0]} description | |
186 | + ${dkpp_id3}= Get From Dictionary ${items[3].additionalClassifications[0]} id | |
187 | + ${unit3}= Get From Dictionary ${items[3].unit} name | |
188 | + | |
189 | + ${deliverydate_end_date3}= Get From Dictionary ${items[3].deliveryDate} endDate | |
190 | + | |
191 | + ${countryName3}= Get From Dictionary ${items[3].deliveryAddress} countryName | |
192 | + ${ZIP3}= Get From Dictionary ${items[3].deliveryAddress} postalCode | |
193 | + ${region3}= Get From Dictionary ${items[3].deliveryAddress} region | |
194 | + ${locality3}= Get From Dictionary ${items[3].deliveryAddress} locality | |
195 | + ${streetAddress3}= Get From Dictionary ${items[3].deliveryAddress} streetAddress | |
149 | 196 | |
150 | - Debug | |
151 | 197 | |
198 | + Click Element xpath=//a[@class="icon-black plus-black remove-field ng-scope"] | |
199 | +###переробити на наступний ітем | |
152 | 200 | |
153 | -<a class="icon-black plus-black remove-field ng-scope" href="" ng-if="$index == tender.items.length - 1" ng-click="addField()" title="Добавить лот"></a> | |
201 | +# Input text id=itemDescription0 ${items_description} | |
202 | + Input text id=itemDescription1 ${items_description1} | |
203 | +# Input text id=quantity0 ${quantity} | |
204 | + Input text id=quantity1 ${quantity1} | |
205 | +### to fix | |
206 | + Click Element xpath=//a[@class="dropdown-toggle ng-binding"] | |
207 | + Click Element xpath=(//span[contains(@class, 'caret')][./text()='единицы измерения']) | |
154 | 208 | |
209 | +<a aria-expanded="false" aria-haspopup="true" class="dropdown-toggle ng-binding" dropdown-toggle=""> | |
210 | + единицы измерения <span class="caret"></span> | |
211 | + </a> | |
212 | + Click Element xpath=//a[contains(text(),'${unit1}')] | |
155 | 213 | |
214 | +# Set CPV | |
215 | + Click Element id=classifier11 | |
216 | + Wait Until Page Contains Element xpath=//input[@class="ng-pristine ng-untouched ng-valid"] 100 | |
217 | + Input text xpath=//input[@class="ng-pristine ng-untouched ng-valid"] ${cpv1} | |
218 | + Wait Until Page Contains Element xpath=//span[contains(text(),'${cpv1}')] 20 | |
219 | + Click Element xpath=//input[@class="ng-pristine ng-untouched ng-valid"] | |
220 | + Click Element xpath=//button[@class="btn btn-default btn-lg pull-right choose ng-binding"] | |
221 | +# Set ДКПП | |
222 | + Click Element id=classifier21 | |
223 | + Wait Until Page Contains Element xpath=//input[@class="ng-pristine ng-untouched ng-valid"] 100 | |
224 | + Input text xpath=//input[@class="ng-pristine ng-untouched ng-valid"] ${dkpp_desc1} | |
225 | + Wait Until Page Contains Element xpath=//span[contains(text(),'${dkpp_id1}')] 100 | |
226 | + Click Element xpath=//span[contains(text(),'${dkpp_id1}')]/../..//input[@class="ng-pristine ng-untouched ng-valid"] | |
227 | + Click Element xpath=//button[@class="btn btn-default btn-lg pull-right choose ng-binding"] | |
228 | +# Set Delivery Address | |
229 | + Click Element id=deliveryAddress1 | |
230 | + Wait Until Page Contains Element xpath=//input[1][@class="form-control ng-pristine ng-untouched ng-valid"] 100 | |
231 | + Input text xpath=//input[1][@class="form-control ng-pristine ng-untouched ng-valid"] ${countryName} | |
232 | + Input text xpath=//input[1][@class="form-control ng-pristine ng-untouched ng-valid"] ${ZIP} | |
233 | + Input text xpath=//input[1][@class="form-control ng-pristine ng-untouched ng-valid"] ${region} | |
234 | + Input text xpath=//input[1][@class="form-control ng-pristine ng-untouched ng-valid"] ${locality} | |
235 | + Input text xpath=//input[1][@class="form-control ng-pristine ng-untouched ng-valid"] ${streetAddress} | |
236 | + Click Element xpath=//button[@class="btn btn-lg single-btn ng-binding"] | |
237 | +# Set Item Datetime | |
238 | + Set datetime end-date-delivery1 ${deliverydate_end_date1} | |
239 | +### | |
240 | + Debug | |
156 | 241 | |
157 | 242 | |
158 | 243 | ... | ... |
... | ... | @@ -151,7 +151,7 @@ def prom_test_tender_data(): |
151 | 151 | "classification": { |
152 | 152 | "scheme": u"CPV", |
153 | 153 | "id": u"44617100-9", |
154 | - "description": u"Cartons" | |
154 | + "description": u"Cartons", | |
155 | 155 | }, |
156 | 156 | "additionalClassifications": [ |
157 | 157 | { |
... | ... | @@ -208,11 +208,11 @@ def test_tender_data_multiple_lots(period_interval=2): |
208 | 208 | } |
209 | 209 | }, |
210 | 210 | "value": { |
211 | - "amount": 50000.99, | |
211 | + "amount": 50000, | |
212 | 212 | "currency": u"UAH" |
213 | 213 | }, |
214 | 214 | "minimalStep": { |
215 | - "amount": 100.1, | |
215 | + "amount": 100, | |
216 | 216 | "currency": u"UAH" |
217 | 217 | }, |
218 | 218 | "items": [ |
... | ... | @@ -235,7 +235,8 @@ def test_tender_data_multiple_lots(period_interval=2): |
235 | 235 | "classification": { |
236 | 236 | "scheme": u"CPV", |
237 | 237 | "id": u"44617100-9", |
238 | - "description": u"Cartons" | |
238 | + "description": u"Cartons", | |
239 | + "description_ua": u"Картонки" | |
239 | 240 | }, |
240 | 241 | "additionalClassifications": [ |
241 | 242 | { |
... | ... | @@ -269,7 +270,8 @@ def test_tender_data_multiple_lots(period_interval=2): |
269 | 270 | "classification": { |
270 | 271 | "scheme": u"CPV", |
271 | 272 | "id": u"44617100-9", |
272 | - "description": u"Cartons" | |
273 | + "description": u"Cartons", | |
274 | + "description_ua": u"Картонки" | |
273 | 275 | }, |
274 | 276 | "additionalClassifications": [ |
275 | 277 | { |
... | ... | @@ -303,7 +305,8 @@ def test_tender_data_multiple_lots(period_interval=2): |
303 | 305 | "classification": { |
304 | 306 | "scheme": u"CPV", |
305 | 307 | "id": u"44617100-9", |
306 | - "description": u"Cartons" | |
308 | + "description": u"Cartons", | |
309 | + "description_ua": u"Картонки" | |
307 | 310 | }, |
308 | 311 | "additionalClassifications": [ |
309 | 312 | { |
... | ... | @@ -337,7 +340,8 @@ def test_tender_data_multiple_lots(period_interval=2): |
337 | 340 | "classification": { |
338 | 341 | "scheme": u"CPV", |
339 | 342 | "id": u"44617100-9", |
340 | - "description": u"Cartons" | |
343 | + "description": u"Cartons", | |
344 | + "description_ua": u"Картонки" | |
341 | 345 | }, |
342 | 346 | "additionalClassifications": [ |
343 | 347 | { | ... | ... |
Please
register
or
login
to post a comment