Showing
3 changed files
with
14 additions
and
7 deletions
... | ... | @@ -71,7 +71,7 @@ Resource playtender_agree |
71 | 71 | |
72 | 72 | open plan search form |
73 | 73 | # Execute Javascript $('#plan-filter-form .dynamic-search-query input').click() |
74 | - go to https://staging.playtender.com.ua/plans?query%5B%5D=${plan_uaid} | |
74 | + go to ${broker_baseurl}/plans?query%5B%5D=${plan_uaid} | |
75 | 75 | input to search form and wait results ${plan_search_form_query_input_locator} ${plan_uaid} ${plan_search_form_result_locator_tpl} |
76 | 76 | |
77 | 77 | Внести зміни в план |
... | ... | @@ -197,7 +197,7 @@ Resource playtender_agree |
197 | 197 | |
198 | 198 | # Run Keyword If '${TEST_NAME}' == 'Можливість знайти звіт про укладений договір по ідентифікатору' sleep 1200 |
199 | 199 | open tender search form |
200 | - go to https://staging.playtender.com.ua/?query%5B%5D=${tender_uaid} | |
200 | + go to ${broker_baseurl}/?query%5B%5D=${tender_uaid} | |
201 | 201 | input to search form and wait results ${tender_search_form_query_input_locator} ${tender_uaid} ${tender_search_form_result_locator_tpl} |
202 | 202 | |
203 | 203 | Отримати інформацію із тендера | ... | ... |
... | ... | @@ -56,11 +56,15 @@ Resource playtender_claim |
56 | 56 | |
57 | 57 | # Log ${tender_с} |
58 | 58 | # bof - fix # |
59 | - ${complaint}= getTenderDataByTenderComplaintsUaId ${API_HOST_URL}/api/${API_VERSION} ${tender_uaid} | |
59 | + ${complaint}= getLastComplaintDataByTenderUaId ${API_HOST_URL}/api/${API_VERSION} ${tender_uaid} | |
60 | + Log ${complaint} | |
61 | + ${complaint}= json_load ${complaint} | |
60 | 62 | Log ${complaint} |
61 | 63 | ${complaint}= op_robot_tests.tests_files.service_keywords.Munchify arg=${complaint} |
62 | 64 | Log ${complaint} |
63 | - ${complaint} = playtender_service.split_complaintdata ${complaint} | |
65 | +## ${complaint} = playtender_service.split_complaintdata ${complaint} | |
66 | +## Log ${complaint} | |
67 | +# ${complaint}= munch_dict arg=${complaint} | |
64 | 68 | # Set To Dictionary ${USERS.users['${username}']} complaint_data=${complaint} |
65 | 69 | Set To Dictionary ${USERS.users['${username}']} complaint_access_token=123 |
66 | 70 | # Log ${USERS.users['playtender_Provider'].complaint_data['complaintID']} | ... | ... |
... | ... | @@ -11,7 +11,8 @@ from iso8601 import parse_date |
11 | 11 | from robot.libraries.BuiltIn import BuiltIn |
12 | 12 | from datetime import datetime, timedelta |
13 | 13 | import pytz |
14 | - | |
14 | +import json | |
15 | +s | |
15 | 16 | TZ = pytz.timezone('Europe/Kiev') |
16 | 17 | |
17 | 18 | |
... | ... | @@ -476,7 +477,7 @@ def prepare_tender_data_cancellation(data_original): |
476 | 477 | |
477 | 478 | return b |
478 | 479 | |
479 | -def getTenderDataByTenderComplaintsUaId(apiBaseUrl, tenderUaId): | |
480 | +def getLastComplaintDataByTenderUaId(apiBaseUrl, tenderUaId): | |
480 | 481 | requestData = {"opt_fields": "tenderID", "descending": "1", "mode": "_all_"} |
481 | 482 | updatesResponse = doGetRequest(apiBaseUrl.strip("/") + "/tenders", data=requestData) |
482 | 483 | if "json" not in updatesResponse: |
... | ... | @@ -492,6 +493,8 @@ def getTenderDataByTenderComplaintsUaId(apiBaseUrl, tenderUaId): |
492 | 493 | if tenderId is None: |
493 | 494 | return {} |
494 | 495 | tenderDataResponse = doGetRequest(apiBaseUrl.strip("/") + "/tenders/" + tenderId + "/complaints", data={}) |
495 | - tenderDataJson = tenderDataResponse['json'] | |
496 | + tenderDataJson = tenderDataResponse['json']['data'][0] | |
496 | 497 | return tenderDataJson |
497 | 498 | |
499 | +def json_load(json_str): | |
500 | + return json.loads(json_str) | ... | ... |
Please
register
or
login
to post a comment