Administrator / playtender-robot_tests · Commits

Commit fbaffa0672f5b28d24d453eabab2df5297ff8af7

Authored by Playtenders
1 parent d4ae220f
build: skipped

parse_deliveryPeriod_date +03 +02

Inline Side-by-side
Showing 4 changed files with 17 additions and 4 deletions
... ... @@ -183,6 +183,9 @@ Resource playtender_agree
183 183 ## run keyword if ${is_test_role_owner} and '${field_name}' in 'awards[0].complaintPeriod.endDate awards[1].complaintPeriod.endDate awards[2].complaintPeriod.endDate awards[3].complaintPeriod.endDate' fix awards data in global Users variable ${username}
184 184
185 185 open tender page by uaid ${tender_uaid}
  186 + Run Keyword And Return If '${field_name}' == 'lots[0].minimalStep.currency' Отримати інформацію із лоту minimalStep.currency ${field_name}
  187 + Run Keyword And Return If '${field_name}' == 'lots[0].minimalStep.valueAddedTaxIncluded' Отримати інформацію із лоту minimalStep.valueAddedTaxIncluded ${field_name}
  188 + Run Keyword And Return If '${field_name}' == 'lots[0].value.valueAddedTaxIncluded' Отримати інформацію із лоту value.valueAddedTaxIncluded ${field_name}
186 189 Run Keyword And Return If '${field_name}' == 'complaintPeriod.endDate' Отримати інформацію із complaintPeriod.endDate
187 190 Run Keyword And Return If '${field_name}' == 'items[0].deliveryLocation.latitude' Fail Поле не відображаем
188 191 run keyword if '${field_name}' == 'status' wait for tender status
... ...
... ... @@ -394,7 +394,11 @@ def parse_deliveryPeriod_date1(date):
394 394 return date
395 395
396 396 def parse_deliveryPeriod_date(date_string):
397   - date_str = datetime.strptime(date_string, "%Y-%m-%dT%H:%M:%S+03:00")
  397 +# date_str = datetime.strptime(date_string, "%Y-%m-%dT%H:%M:%S+03:00")
  398 + if '+03' in date_string:
  399 + date_str = datetime.strptime(date_string, "%Y-%m-%dT%H:%M:%S+03:00")
  400 + else:
  401 + date_str = datetime.strptime(date_string, "%Y-%m-%dT%H:%M:%S+02:00")
398 402 date = datetime(date_str.year, date_str.month, date_str.day)
399 403 date = date.strftime("%d.%m.%Y")
400 404 return date
... ...
... ... @@ -252,11 +252,13 @@ ${tender_lot_description_value_locator} = jquery=#lots
252 252 ${tender_lot_value_amount_value_locator} = jquery=#lots .tabs__content .tabs__pane--visible .budget-source.hidden
253 253 ${tender_lot_value_amount_value_type} = float
254 254 ${tender_lot_value_currency_value_locator} = jquery=#tender-general-info .budget-currency.hidden
255   -${tender_lot_value_value_added_tax_included_value_locator} = jquery=#lots .tabs__content .tabs__pane--visible .budget-source.hidden
  255 +${tender_lot_value_value_added_tax_included_value_locator} = jquery=#lots .tabs__content .tabs__pane--visible .budget .value
  256 +${tender_lot_minimal_step_currency_value_locator} = jquery=#lots .tabs__content .tabs__pane--visible .minimal-step .value
256 257 ${tender_lot_minimal_step_amount_value_locator} = jquery=#lots .tabs__content .tabs__pane--visible .minimal-step-source.hidden
257 258 ${tender_lot_minimal_step_amount_value_type} = float
258 259 ${tender_lot_minimal_step_amount_currency_value_locator} = jquery=#lots .tabs__content .tabs__pane--visible .budget-source.hidden
259 260 ${tender_lot_minimal_step_amount_value_added_tax_included_value_locator} = jquery=#lots .tabs__content .tabs__pane--visible .budget-source.hidden
  261 +${tender_lot_minimal_step_value_added_tax_included_value_locator} = jquery=#lots .tabs__content .tabs__pane--visible .minimal-step .value
260 262
261 263 ##### BOF - TMP #####
262 264 ${tender_lot_0_title_value_locator} = jquery=#lots .tabs__content .tabs__pane--visible > span div.textvalue.hidden
... ...
... ... @@ -282,7 +282,8 @@ get value from lot
282 282
283 283 # ${tender_lot_value_value_added_tax_included_value_locator} = replace string ${tender_lot_value_value_added_tax_included_value_locator_tpl} %lot_id% ${lot_id}
284 284 ${return_value} = get value by locator on opened page ${tender_lot_value_value_added_tax_included_value_locator}
285   - ${return_value} = set variable if ${return_value} == 1 True
  285 + ${return_value} = set variable if 'з ПДВ' in '${return_value}' ${True} ${False}
  286 +# ${return_value} = set variable if ${return_value} == 1 True
286 287 [return] ${return_value}
287 288
288 289 Отримати інформацію із лоту minimalStep.currency
... ... @@ -291,6 +292,7 @@ get value from lot
291 292
292 293 # ${tender_lot_minimal_step_currency_value_locator} = replace string ${tender_lot_minimal_step_currency_value_locator_tpl} %lot_id% ${lot_id}
293 294 ${return_value} = get value by locator on opened page ${tender_lot_minimal_step_currency_value_locator}
  295 + ${return_value} = set variable if 'UAH' in '${return_value}' UAH
294 296 [return] ${return_value}
295 297
296 298 Отримати інформацію із лоту minimalStep.valueAddedTaxIncluded
... ... @@ -298,7 +300,9 @@ get value from lot
298 300 [Documentation] Отримати значення поля description з лоту з lot_id в описі для тендера tender_uaid.
299 301
300 302 # ${tender_lot_value_minimal_step_added_tax_included_value_locator} = replace string ${tender_lot_minimal_step_value_added_tax_included_value_locator_tpl} %lot_id% ${lot_id}
301   - ${return_value} = get value by locator on opened page ${tender_lot_minimal_step_value_added_tax_included_value_locator}
  303 +# ${return_value} = get value by locator on opened page ${tender_lot_minimal_step_value_added_tax_included_value_locator}
  304 + ${return_value} = get value by locator on opened page ${tender_lot_value_value_added_tax_included_value_locator}
  305 + ${return_value} = set variable if 'з ПДВ' in '${return_value}' ${True} ${False}
302 306 [return] ${return_value}
303 307
304 308 Отримати інформацію із лоту auctionPeriod.startDate
... ...
Please register or login to post a comment