Alex / prozorro-robot_tests · Commits

Commit 6b1f3a09b5c7e2a6bde9ba1d8b390c0ebcefc7bf

Authored by alexdiatlov
Committed by GitHub
2 parents 74b320b7 fad0c89a

Merge pull request #158 from ProzorroUKR/test_scenario_fixes 

Test scenario fixes
Inline Side-by-side
Showing 4 changed files with 41 additions and 8 deletions
@@ -35,7 +35,10 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status @@ -35,7 +35,10 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status
35 ${FUNDING_KIND}= Get Variable Value ${FUNDING_KIND} 35 ${FUNDING_KIND}= Get Variable Value ${FUNDING_KIND}
36 Run keyword if '${DIALOGUE_TYPE}' != '${None}' Set to dictionary ${tender_parameters} dialogue_type=${DIALOGUE_TYPE} 36 Run keyword if '${DIALOGUE_TYPE}' != '${None}' Set to dictionary ${tender_parameters} dialogue_type=${DIALOGUE_TYPE}
37 Run keyword if '${FUNDING_KIND}' != '${None}' Set to dictionary ${tender_parameters} fundingKind=${FUNDING_KIND} 37 Run keyword if '${FUNDING_KIND}' != '${None}' Set to dictionary ${tender_parameters} fundingKind=${FUNDING_KIND}
38 - ${plan_data}= Run as ${tender_owner} Пошук плану по ідентифікатору ${ARTIFACT.tender_uaid} 38 + :FOR ${username} IN ${viewer} ${tender_owner}
  39 + \ ${status}= Run Keyword And Return Status List Should Contain Value ${USERS.users['${username}']} plan_client
  40 + \ Run Keyword If ${status} Exit For Loop
  41 + ${plan_data}= знайти план за ідентифікатором ${ARTIFACT.tender_uaid} ${username}
39 Log ${plan_data} 42 Log ${plan_data}
40 ${tender_data}= Підготувати дані для створення тендера ${tender_parameters} ${plan_data} 43 ${tender_data}= Підготувати дані для створення тендера ${tender_parameters} ${plan_data}
41 ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_data} 44 ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_data}
@@ -2260,4 +2260,11 @@ Library openprocurement_client.utils @@ -2260,4 +2260,11 @@ Library openprocurement_client.utils
2260 ... ${USERS.users['${username}'].agreement_data.data} 2260 ... ${USERS.users['${username}'].agreement_data.data}
2261 ... ${field_name} 2261 ... ${field_name}
2262 Run Keyword If '${status}' == 'PASS' Return From Keyword ${field_value} 2262 Run Keyword If '${status}' == 'PASS' Return From Keyword ${field_value}
2263 - Fail Field not found: ${field_name}  
  2263 + Fail Field not found: ${field_name}
  2264 +
  2265 +
  2266 +знайти план за ідентифікатором
  2267 + [Arguments] ${tender_uaid} ${username} ${save_key}=tender_data
  2268 + ${internalid}= openprocurement_client.Отримати internal id плану по UAid ${username} ${tender_uaid}
  2269 + ${plan}= openprocurement_client.Отримати план по внутрішньому ідентифікатору ${username} ${internalid} ${save_key}
  2270 + [return] ${plan}
@@ -276,14 +276,14 @@ users: @@ -276,14 +276,14 @@ users:
276 size: [800, 700] 276 size: [800, 700]
277 PrivatMarket_Viewer: 277 PrivatMarket_Viewer:
278 broker: PrivatMarket 278 broker: PrivatMarket
279 - homepage: "https://zakupivli24.pb.ua/stage/ptr/registry.html?lang=uk" 279 + homepage: "https://zakupivli24.pb.ua/prz-stage/tender"
280 email: pbecommercetest2@ukr.net 280 email: pbecommercetest2@ukr.net
281 browser: chrome 281 browser: chrome
282 position: [0, 0] 282 position: [0, 0]
283 size: [1920, 1080] 283 size: [1920, 1080]
284 PrivatMarket_Provider: 284 PrivatMarket_Provider:
285 broker: PrivatMarket 285 broker: PrivatMarket
286 - homepage: "https://zakupivli24.pb.ua/stage/ptr/registry.html?lang=uk" 286 + homepage: "https://zakupivli24.pb.ua/prz-stage/tender"
287 email: pbecommercetest2@ukr.net 287 email: pbecommercetest2@ukr.net
288 login: 380270010001 288 login: 380270010001
289 password: password0001 289 password: password0001
@@ -292,19 +292,19 @@ users: @@ -292,19 +292,19 @@ users:
292 size: [1920, 1080] 292 size: [1920, 1080]
293 PrivatMarket_Provider1: 293 PrivatMarket_Provider1:
294 broker: PrivatMarket 294 broker: PrivatMarket
295 - homepage: "https://zakupivli24.pb.ua/stage/ptr/registry.html?lang=uk" 295 + homepage: "https://zakupivli24.pb.ua/prz-stage/tender"
296 email: pbecommercetest2@ukr.net 296 email: pbecommercetest2@ukr.net
297 login: 380270010002 297 login: 380270010002
298 - password: password0002 298 + password: zakupivli24
299 browser: chrome 299 browser: chrome
300 position: [0, 0] 300 position: [0, 0]
301 size: [1920, 1080] 301 size: [1920, 1080]
302 PrivatMarket_Owner: 302 PrivatMarket_Owner:
303 broker: PrivatMarket 303 broker: PrivatMarket
304 - homepage: "https://zakupivli24.pb.ua/stage/ptr/registry.html?lang=uk" 304 + homepage: "https://zakupivli24.pb.ua/prz-stage/tender"
305 email: pbecommercetest1@ukr.net 305 email: pbecommercetest1@ukr.net
306 login: 380270010003 306 login: 380270010003
307 - password: password0003 307 + password: zakupivli24
308 browser: chrome 308 browser: chrome
309 position: [0, 0] 309 position: [0, 0]
310 size: [1920, 1080] 310 size: [1920, 1080]
@@ -817,6 +817,29 @@ @@ -817,6 +817,29 @@
817 "region": "місто Київ", 817 "region": "місто Київ",
818 "locality": "Київ" 818 "locality": "Київ"
819 } 819 }
  820 + },
  821 + {
  822 + "contactPoint": {
  823 + "url": "http://www.page.gov.ua/",
  824 + "telephone": "+380506665544",
  825 + "email": "test_e_mail@ukr.net",
  826 + "name": "Тестовий Учасник 2",
  827 + "faxNumber": "9998877"
  828 + },
  829 + "identifier": {
  830 + "scheme": "UA-EDR",
  831 + "id": "00037256",
  832 + "legalName": "Тестове державне управління справами"
  833 + },
  834 + "scale": "not specified",
  835 + "name": "Тестове державне управління справами",
  836 + "address": {
  837 + "postalCode": "01111",
  838 + "countryName": "Україна",
  839 + "streetAddress": "Тестова вулиця, 21-29",
  840 + "region": "Київська область",
  841 + "locality": "Переяслав-Хмельницький"
  842 + }
820 } 843 }
821 ], 844 ],
822 "addresses": [ 845 "addresses": [
Please register or login to post a comment