Merge pull request #194 from ProzorroUKR/dev_prozorro

Dev prozorro

Merge pull request #194 from ProzorroUKR/dev_prozorro
Dev prozorro
alexdiatlov · GitHub
2 parents 99e8c892 0ddc974c
Showing 3 changed files with 18 additions and 28 deletions
op_robot_tests/tests_files/base_keywords.robot
op_robot_tests/tests_files/brokers/openprocurement_client.robot
op_robot_tests/tests_files/resource.robot
--- a/op_robot_tests/tests_files/base_keywords.robot
View file @9d23a46
+++ b/op_robot_tests/tests_files/base_keywords.robot
View file @9d23a46
@@ -14,8 +14,6 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
   ${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact_plan.yaml
   ${ARTIFACT}=  load_data_from  ${file_path}
   Log  ${ARTIFACT.tender_uaid}
-  Log  ${ARTIFACT.tender_id}
-  Log  ${ARTIFACT.tender_owner_access_token}
   ${NUMBER_OF_LOTS}=  Convert To Integer  ${NUMBER_OF_LOTS}
   ${NUMBER_OF_ITEMS}=  Convert To Integer  ${NUMBER_OF_ITEMS}
   ${NUMBER_OF_MILESTONES}=  Convert To Integer  ${NUMBER_OF_MILESTONES}
@@ -44,7 +42,7 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
   Log  ${plan_data}
   ${tender_data}=  Підготувати дані для створення тендера  ${tender_parameters}  ${plan_data}
   ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_data}
-  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data}  ${ARTIFACT.tender_id}  ${ARTIFACT.tender_owner_access_token}
+  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data}  ${ARTIFACT.tender_uaid}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${adapted_data}
   Set To Dictionary  ${TENDER}  TENDER_UAID=${TENDER_UAID}
@@ -78,8 +76,6 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
   ${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact_plan.yaml
   ${ARTIFACT}=  load_data_from  ${file_path}
   Log  ${ARTIFACT.tender_uaid}
-  Log  ${ARTIFACT.tender_id}
-  Log  ${ARTIFACT.tender_owner_access_token}
   [Arguments]  ${data_version}
   ${NUMBER_OF_LOTS}=  Convert To Integer  ${NUMBER_OF_LOTS}
   ${NUMBER_OF_ITEMS}=  Convert To Integer  ${NUMBER_OF_ITEMS}
@@ -107,7 +103,7 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
   ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_data}
   ${adapted_data_mnn}=  edit_tender_data_for_mnn  ${adapted_data}  ${MODE}  ${data_version}
   Log  ${adapted_data_mnn}
-  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data_mnn}  ${ARTIFACT.tender_id}  ${ARTIFACT.tender_owner_access_token}
+  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data_mnn}  ${ARTIFACT.tender_uaid}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${adapted_data_mnn}
   Set To Dictionary  ${TENDER}  TENDER_UAID=${TENDER_UAID}
@@ -117,8 +113,6 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
   ${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact_plan.yaml
   ${ARTIFACT}=  load_data_from  ${file_path}
   Log  ${ARTIFACT.tender_uaid}
-  Log  ${ARTIFACT.tender_id}
-  Log  ${ARTIFACT.tender_owner_access_token}
   ${NUMBER_OF_LOTS}=  Convert To Integer  ${NUMBER_OF_LOTS}
   ${NUMBER_OF_ITEMS}=  Convert To Integer  ${NUMBER_OF_ITEMS}
   ${NUMBER_OF_MILESTONES}=  Convert To Integer  ${NUMBER_OF_MILESTONES}
@@ -145,7 +139,7 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
   ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_data}
   ${adapted_data_cost}=  edit_tender_data_for_cost  ${adapted_data}  ${MODE}  ${data_version}
   Log  ${adapted_data_cost}
-  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data_cost}  ${ARTIFACT.tender_id}  ${ARTIFACT.tender_owner_access_token}
+  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data_cost}  ${ARTIFACT.tender_uaid}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${adapted_data_cost}
   Set To Dictionary  ${TENDER}  TENDER_UAID=${TENDER_UAID}
@@ -155,8 +149,6 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
   ${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact_plan.yaml
   ${ARTIFACT}=  load_data_from  ${file_path}
   Log  ${ARTIFACT.tender_uaid}
-  Log  ${ARTIFACT.tender_id}
-  Log  ${ARTIFACT.tender_owner_access_token}
   ${NUMBER_OF_LOTS}=  Convert To Integer  ${NUMBER_OF_LOTS}
   ${NUMBER_OF_ITEMS}=  Convert To Integer  ${NUMBER_OF_ITEMS}
   ${NUMBER_OF_MILESTONES}=  Convert To Integer  ${NUMBER_OF_MILESTONES}
@@ -183,7 +175,7 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
   ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_data}
   ${adapted_data_gmdn}=  edit_tender_data_for_gmdn  ${adapted_data}  ${MODE}  ${data_version}
   Log  ${adapted_data_gmdn}
-  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data_gmdn}  ${ARTIFACT.tender_id}  ${ARTIFACT.tender_owner_access_token}
+  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data_gmdn}  ${ARTIFACT.tender_uaid}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${adapted_data_gmdn}
   Set To Dictionary  ${TENDER}  TENDER_UAID=${TENDER_UAID}
@@ -193,8 +185,6 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
   ${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact_plan.yaml
   ${ARTIFACT}=  load_data_from  ${file_path}
   Log  ${ARTIFACT.tender_uaid}
-  Log  ${ARTIFACT.tender_id}
-  Log  ${ARTIFACT.tender_owner_access_token}
   ${NUMBER_OF_LOTS}=  Convert To Integer  ${NUMBER_OF_LOTS}
   ${NUMBER_OF_ITEMS}=  Convert To Integer  ${NUMBER_OF_ITEMS}
   ${NUMBER_OF_MILESTONES}=  Convert To Integer  ${NUMBER_OF_MILESTONES}
@@ -221,7 +211,7 @@ ${ERROR_PLAN_MESSAGE}=  Calling method 'get_plan' failed: ResourceGone: {"status
   ${adapted_data}=  Адаптувати дані для оголошення тендера  ${tender_data}
   ${adapted_data_plan_tender}=  edit_tender_data_for_plan_tender  ${adapted_data}  ${MODE}  ${data_version}
   Log  ${adapted_data_plan_tender}
-  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data_plan_tender}  ${ARTIFACT.tender_id}  ${ARTIFACT.tender_owner_access_token}
+  ${TENDER_UAID}=  Run As  ${tender_owner}  Створити тендер  ${adapted_data_plan_tender}  ${ARTIFACT.tender_uaid}
   Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${adapted_data_plan_tender}
   Set To Dictionary  ${TENDER}  TENDER_UAID=${TENDER_UAID}
--- a/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @9d23a46
+++ b/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @9d23a46
@@ -189,15 +189,15 @@ Library  openprocurement_client.utils
 Створити тендер
-  [Arguments]  ${username}  ${tender_data}  ${plan_id}  ${plan_access_token}
-  #${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact_plan.yaml
-  #${ARTIFACT}=  load_data_from  ${file_path}
-  #Log  ${ARTIFACT.tender_owner_access_token}
-  #Log  ${ARTIFACT.tender_id}
+  [Arguments]  ${username}  ${tender_data}  ${plan_uaid}
+  ${file_path}=  Get Variable Value  ${ARTIFACT_FILE}  artifact_plan.yaml
+  ${ARTIFACT}=  load_data_from  ${file_path}
+  Log  ${ARTIFACT.tender_owner_access_token}
+  Log  ${ARTIFACT.tender_id}
   ${tender}=  Call Method  ${USERS.users['${username}'].tender_create_client}  create_tender
-  ...      ${plan_id}
+  ...      ${ARTIFACT.tender_id}
   ...      ${tender_data}
-  ...      access_token=${plan_access_token}
+  ...      access_token=${ARTIFACT.tender_owner_access_token}
   Log  ${tender}
   ${access_token}=  Get Variable Value  ${tender.access.token}
   ${status}=  Set Variable If  'open' in '${MODE}'  active.tendering  ${EMPTY}
--- a/op_robot_tests/tests_files/resource.robot
View file @9d23a46
+++ b/op_robot_tests/tests_files/resource.robot
View file @9d23a46
 *** Variables ***
 ${RESOURCE}      tenders   # possible values: tenders, auctions
-${API_HOST_URL}  https://lb-api-sandbox.prozorro.gov.ua
+${API_HOST_URL}  https://lb-api-staging.prozorro.gov.ua
 ${API_VERSION}   2.4
 ${BROKER}        Quinta
-${DS_HOST_URL}   https://upload-docs-sandbox.prozorro.gov.ua
+${DS_HOST_URL}   https://upload-docs-staging.prozorro.gov.ua
 ${ROLE}          viewer
-${EDR_HOST_URL}  https://lb-edr-sandbox.prozorro.gov.ua
+${EDR_HOST_URL}  https://lb-edr-staging.prozorro.gov.ua
 ${EDR_VERSION}   0
 ${DASU_RESOURCE}      monitorings
-${DASU_API_HOST_URL}  https://audit-api-sandbox.prozorro.gov.ua
+${DASU_API_HOST_URL}  https://audit-api-staging.prozorro.gov.ua
 ${DASU_API_VERSION}   2.4
-${DS_REGEXP}        ^https?:\\/\\/public-docs(?:-sandbox)?\\.prozorro\\.gov\\.ua\\/get\\/([0-9A-Fa-f]{32})
-${AUCTION_REGEXP}   ^https?:\\/\\/auction(?:-sandbox)?\\.prozorro\\.gov\\.ua\\/(esco-)?tenders\\/([0-9A-Fa-f]{32})
+${DS_REGEXP}        ^https?:\/\/public-docs(?:-staging)?\.prozorro\.gov\.ua\/get\/([0-9A-Fa-f]{32})
+${AUCTION_REGEXP}   ^https?:\/\/auction(?:-staging)?\.prozorro\.gov\.ua\/(esco-)?tenders\/([0-9A-Fa-f]{32})