Merge branch 'pc2' into pc2r

Conflicts: op_robot_tests/tests_files/brokers/etender.robot op_robot_tests/tests_files/brokers/netcast.robot op_robot_tests/tests_files/brokers/newtend.robot op_robot_tests/tests_files/brokers/openprocurement_client.robot op_robot_tests/tests_files/brokers/publicbid.robot op_robot_tests/tests_files/data/users.yaml op_robot_tests/tests_files/service_keywords.py op_robot_tests/tests_files/singleItemTender.robot

Merge branch 'pc2' into pc2r
Conflicts: op_robot_tests/tests_files/brokers/etender.robot op_robot_tests/tests_files/brokers/netcast.robot op_robot_tests/tests_files/brokers/newtend.robot op_robot_tests/tests_files/brokers/openprocurement_client.robot op_robot_tests/tests_files/brokers/publicbid.robot op_robot_tests/tests_files/data/users.yaml op_robot_tests/tests_files/service_keywords.py op_robot_tests/tests_files/singleItemTender.robot
biviktorqc
2 parents f451e93a 9f9fd974
Showing 9 changed files with 102 additions and 125 deletions
op_robot_tests/tests_files/brokers/etender.robot
op_robot_tests/tests_files/brokers/netcast.robot
op_robot_tests/tests_files/brokers/newtend.robot
op_robot_tests/tests_files/brokers/openprocurement_client.robot
op_robot_tests/tests_files/brokers/publicbid.robot
op_robot_tests/tests_files/data/users.yaml
op_robot_tests/tests_files/initial_data.py
op_robot_tests/tests_files/service_keywords.py
op_robot_tests/tests_files/singleItemTender.robot
--- a/op_robot_tests/tests_files/brokers/etender.robot
View file @907b22a
+++ b/op_robot_tests/tests_files/brokers/etender.robot
View file @907b22a
@@ -5,6 +5,8 @@ Library  DateTime
 *** Variables ***
 ${locator.tenderId}                  jquery=h3
+##Використовую такий шлях у кожного буде мінятись /yboi/. Міняйте на сві шлях до файлу
+${file_path}     /home/yboi/openprocurement.robottests.buildout/Document.docx
 *** Keywords ***
 Підготувати клієнт для користувача
@@ -25,30 +27,30 @@ ${locator.tenderId}                  jquery=h3
   [Arguments]  @{ARGUMENTS}
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
-  ...      ${ARGUMENTS[1]} ==  tender_data
-  ${tender_data}=   Add_time_for_GUI_FrontEnds   ${ARGUMENTS[1]}
-  ${items}=         Get From Dictionary   ${tender_data.data}               items
-  ${title}=         Get From Dictionary   ${tender_data.data}               title
-  ${description}=   Get From Dictionary   ${tender_data.data}               description
-  ${budget}=        Get From Dictionary   ${tender_data.data.value}         amount
-  ${step_rate}=     Get From Dictionary   ${tender_data.data.minimalStep}   amount
-  ${items_description}=   Get From Dictionary   ${tender_data.data}         description
+  ...      ${ARGUMENTS[1]} ==  initial_tender_data
+  ${prepared_tender_data}=   Add_data_for_GUI_FrontEnds   ${ARGUMENTS[1]}
+  ${items}=         Get From Dictionary   ${prepared_tender_data.data}               items
+  ${title}=         Get From Dictionary   ${prepared_tender_data.data}               title
+  ${description}=   Get From Dictionary   ${prepared_tender_data.data}               description
+  ${budget}=        Get From Dictionary   ${prepared_tender_data.data.value}         amount
+  ${step_rate}=     Get From Dictionary   ${prepared_tender_data.data.minimalStep}   amount
+  ${items_description}=   Get From Dictionary   ${prepared_tender_data.data}         description
   ${quantity}=      Get From Dictionary   ${items[0]}                        quantity
   ${cpv}=           Get From Dictionary   ${items[0].classification}         id
   ${dkpp_desc}=     Get From Dictionary   ${items[0].additionalClassifications[0]}   description
   ${dkpp_id}=       Get From Dictionary   ${items[0].additionalClassifications[0]}  id
   ${unit}=          Get From Dictionary   ${items[0].unit}                   name
-  ${start_date}=    Get From Dictionary   ${tender_data.data.tenderPeriod}   startDate
+  ${start_date}=    Get From Dictionary   ${prepared_tender_data.data.tenderPeriod}   startDate
   ${start_date}=    convert_date_to_etender_format   ${start_date}
-  ${start_time}=    Get From Dictionary   ${tender_data.data.tenderPeriod}   startDate
+  ${start_time}=    Get From Dictionary   ${prepared_tender_data.data.tenderPeriod}   startDate
   ${start_time}=    convert_time_to_etender_format   ${start_time}
-  ${end_date}=      Get From Dictionary   ${tender_data.data.tenderPeriod}   endDate
+  ${end_date}=      Get From Dictionary   ${prepared_tender_data.data.tenderPeriod}   endDate
   ${end_date}=      convert_date_to_etender_format   ${end_date}
-  ${end_time}=      Get From Dictionary   ${tender_data.data.tenderPeriod}   endDate
+  ${end_time}=      Get From Dictionary   ${prepared_tender_data.data.tenderPeriod}   endDate
   ${end_time}=   convert_time_to_etender_format      ${end_time}
-  ${enquiry_end_date}=   Get From Dictionary         ${tender_data.data.enquiryPeriod}   endDate
+  ${enquiry_end_date}=   Get From Dictionary         ${prepared_tender_data.data.enquiryPeriod}   endDate
   ${enquiry_end_date}=   convert_date_to_etender_format   ${enquiry_end_date}
-  ${enquiry_end_time}=   Get From Dictionary              ${tender_data.data.enquiryPeriod}   endDate
+  ${enquiry_end_time}=   Get From Dictionary              ${prepared_tender_data.data.enquiryPeriod}   endDate
   ${enquiry_end_time}=   convert_time_to_etender_format   ${enquiry_end_time}
   Selenium2Library.Switch Browser    ${ARGUMENTS[0]}
   Wait Until Page Contains          Мої закупівлі    100
@@ -88,8 +90,10 @@ ${locator.tenderId}                  jquery=h3
   Click Element   xpath=//div[contains(@class, 'form-actions')]//button[@type='submit']
   Wait Until Page Contains    [ТЕСТУВАННЯ]   100
   Click Element   xpath=//table[contains(@class, 'table table-hover table-striped table-bordered ng-scope ng-table')]//tr[1]//a
-  ${tender_UAid}=   Wait Until Keyword Succeeds   240sec   2sec   get tender UAid
-###  harcode Idis bacause issues on the E-tender side, to remove, 1 line:
+  Sleep   5
+  ${tender_UAid}=  Get Text  xpath=//div[contains(@class, "panel-heading")]
+  ${tender_UAid}=  Get Substring  ${tender_UAid}   7
+  ###  harcode Idis bacause issues on the E-tender side, to remove, 1 line:
   ${tender_UAid}=   Convert To String   UA-2015-08-03-000025
   ${Ids}=   Convert To String   ${tender_UAid}
   Run keyword if   '${mode}' == 'multi'   Set Multi Ids   ${ARGUMENTS[0]}   ${tender_UAid}
@@ -99,14 +103,9 @@ Set Multi Ids
   [Arguments]  @{ARGUMENTS}
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
-  ...      ${ARGUMENTS[1]} ==  ${tender_UAid}
-  ${id}=   Oтримати internal id по UAid   ${ARGUMENTS[0]}   ${ARGUMENTS[1]}
+  ${id}=   Get Text  xpath=//div[contains(@class, "panel-heading")]
   ${Ids}=   Create List    ${tender_UAid}   ${id}
-get tender UAid
-  ${tender_UAid}=  Get Text  xpath=//div[contains(@class, "panel-heading")]
-  ${tender_UAid}=  Get Substring  ${tender_UAid}  7  27
-
 Oтримати internal id по UAid
   [Arguments]  @{ARGUMENTS}
   [Documentation]
--- a/op_robot_tests/tests_files/brokers/netcast.robot
View file @907b22a
+++ b/op_robot_tests/tests_files/brokers/netcast.robot
View file @907b22a
@@ -20,7 +20,7 @@ ${file_path}                         local_path_to_file("TestDocument.docx")
   Wait Until Page Contains Element    jquery=a[href="/cabinet"]
   Click Element                       jquery=a[href="/cabinet"]
   Wait Until Page Contains Element    name=email   10
-#  Input text    name=email     mail
+  Input text    name=email     mail
   Sleep  1
   Input text    name=email      ${USERS.users['${username}'].login}
   Sleep  2
@@ -42,26 +42,26 @@ Pre Login
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  tender_data
-  ${tender_data}=   Add_time_for_GUI_FrontEnds   ${ARGUMENTS[1]}
-  ${items}=         Get From Dictionary   ${tender_data.data}               items
-  ${title}=         Get From Dictionary   ${tender_data.data}               title
-  ${description}=   Get From Dictionary   ${tender_data.data}               description
-  ${budget}=        Get From Dictionary   ${tender_data.data.value}         amount
-  ${step_rate}=     Get From Dictionary   ${tender_data.data.minimalStep}   amount
-  ${items_description}=   Get From Dictionary   ${tender_data.data}         description
+  ${prepared_tender_data}=   Add_data_for_GUI_FrontEnds   ${ARGUMENTS[1]}
+  ${items}=         Get From Dictionary   ${prepared_tender_data.data}               items
+  ${title}=         Get From Dictionary   ${prepared_tender_data.data}               title
+  ${description}=   Get From Dictionary   ${prepared_tender_data.data}               description
+  ${budget}=        Get From Dictionary   ${prepared_tender_data.data.value}         amount
+  ${step_rate}=     Get From Dictionary   ${prepared_tender_data.data.minimalStep}   amount
+  ${items_description}=   Get From Dictionary   ${prepared_tender_data.data}         description
   ${quantity}=      Get From Dictionary   ${items[0]}         quantity
-  ${countryName}=   Get From Dictionary   ${tender_data.data.procuringEntity.address}       countryName
+  ${countryName}=   Get From Dictionary   ${prepared_tender_data.data.procuringEntity.address}       countryName
   ${delivery_end_date}=      Get From Dictionary   ${items[0].deliveryDate}   endDate
   ${delivery_end_date}=      convert_date_to_slash_format   ${delivery_end_date}
-  ${cpv}=           Get From Dictionary   ${items[0].classification}          description_ua
+  ${cpv}=           Convert To String   Картонки
   ${cpv_id}=           Get From Dictionary   ${items[0].classification}         id
   ${cpv_id1}=       Replace String   ${cpv_id}   -   _
   ${dkpp_desc}=     Get From Dictionary   ${items[0].additionalClassifications[0]}   description
   ${dkpp_id}=       Get From Dictionary   ${items[0].additionalClassifications[0]}  id
   ${dkpp_id1}=      Replace String   ${dkpp_id}   -   _
-  ${enquiry_end_date}=   Get From Dictionary         ${tender_data.data.enquiryPeriod}   endDate
+  ${enquiry_end_date}=   Get From Dictionary         ${prepared_tender_data.data.enquiryPeriod}   endDate
   ${enquiry_end_date}=   convert_date_to_slash_format   ${enquiry_end_date}
-  ${end_date}=      Get From Dictionary   ${tender_data.data.tenderPeriod}   endDate
+  ${end_date}=      Get From Dictionary   ${prepared_tender_data.data.tenderPeriod}   endDate
   ${end_date}=      convert_date_to_slash_format   ${end_date}
   Selenium2Library.Switch Browser     ${ARGUMENTS[0]}
@@ -78,7 +78,6 @@ Pre Login
   Input text                          name=items[0][item_deliveryDate_endDate]       ${delivery_end_date}
   Click Element                       xpath=//a[@class ='uploadFile']
   Choose File                         xpath=//a[@class ='uploadFile']       ${file_path}
-  Debug
   Click Element                       xpath=//a[contains(@data-class, 'cpv')][./text()='Визначити за довідником']
   Select Frame                        xpath=//iframe[contains(@src,'/js/classifications/cpv/uk.htm?relation=true')]
   Input text                          id=search     ${cpv}
@@ -191,7 +190,6 @@ Set Multi Ids
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  tenderId
   Switch browser   ${ARGUMENTS[0]}
-
   Go to   ${BROKERS['${USERS.users['${username}'].broker}'].url}
   Wait Until Page Contains            Держзакупівлі.онлайн   10
 #  sleep  1
--- a/op_robot_tests/tests_files/brokers/newtend.robot
View file @907b22a
+++ b/op_robot_tests/tests_files/brokers/newtend.robot
View file @907b22a
@@ -15,7 +15,6 @@ ${locator.tenderId}                  jquery=h3
   [Arguments]  @{ARGUMENTS}
   [Documentation]  Відкрити брaвзер, створити обєкт api wrapper, тощо
   ...      ${ARGUMENTS[0]} ==  username
-
   Open Browser   ${BROKERS['${USERS.users['${username}'].broker}'].url}   ${USERS.users['${username}'].browser}   alias=${ARGUMENTS[0]}
   Set Window Size   @{USERS.users['${ARGUMENTS[0]}'].size}
   Set Window Position   @{USERS.users['${ARGUMENTS[0]}'].position}
@@ -31,18 +30,18 @@ ${locator.tenderId}                  jquery=h3
   [Arguments]  @{ARGUMENTS}
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
-  ...      ${ARGUMENTS[1]} ==  tender_data
-
+  ...      ${ARGUMENTS[1]} ==  initial_tender_data
 ## Inicialisation
-  ${items}=         Get From Dictionary   ${ARGUMENTS[1].data}               items
-  ${title}=         Get From Dictionary   ${ARGUMENTS[1].data}               title
-  ${description}=   Get From Dictionary   ${ARGUMENTS[1].data}               description
-  ${budget}=        Get From Dictionary   ${ARGUMENTS[1].data.value}         amount
-  ${step_rate}=     Get From Dictionary   ${ARGUMENTS[1].data.minimalStep}   amount
-  ${start_date}=           Get From Dictionary   ${ARGUMENTS[1].data.tenderPeriod}    startDate
-  ${end_date}=             Get From Dictionary   ${ARGUMENTS[1].data.tenderPeriod}    endDate
-  ${enquiry_start_date}=   Get From Dictionary   ${ARGUMENTS[1].data.enquiryPeriod}   startDate
-  ${enquiry_end_date}=     Get From Dictionary   ${ARGUMENTS[1].data.enquiryPeriod}   endDate
+  ${prepared_tender_data}=   Add_data_for_GUI_FrontEnds   ${ARGUMENTS[1]}
+  ${items}=         Get From Dictionary   ${prepared_tender_data.data}               items
+  ${title}=         Get From Dictionary   ${prepared_tender_data.data}               title
+  ${description}=   Get From Dictionary   ${prepared_tender_data.data}               description
+  ${budget}=        Get From Dictionary   ${prepared_tender_data.data.value}         amount
+  ${step_rate}=     Get From Dictionary   ${prepared_tender_data.data.minimalStep}   amount
+  ${start_date}=           Get From Dictionary   ${prepared_tender_data.data.tenderPeriod}    startDate
+  ${end_date}=             Get From Dictionary   ${prepared_tender_data.data.tenderPeriod}    endDate
+  ${enquiry_start_date}=   Get From Dictionary   ${prepared_tender_data.data.enquiryPeriod}   startDate
+  ${enquiry_end_date}=     Get From Dictionary   ${prepared_tender_data.data.enquiryPeriod}   endDate
   Selenium2Library.Switch Browser    ${ARGUMENTS[0]}
   Go To                              ${USERS.users['${username}'].homepage}
@@ -109,7 +108,7 @@ Set datetime
 ## Get values for item
   ${items_description}=   Get From Dictionary   ${ARGUMENTS[0]}                          description
   ${quantity}=      Get From Dictionary   ${ARGUMENTS[0]}                                quantity
-  ${cpv}=           Get From Dictionary   ${ARGUMENTS[0].classification}                 description_ua
+  ${cpv}=           Convert To String     Картонки
   ${dkpp_desc}=     Get From Dictionary   ${ARGUMENTS[0].additionalClassifications[0]}   description
   ${dkpp_id}=       Get From Dictionary   ${ARGUMENTS[0].additionalClassifications[0]}   id
   ${unit}=          Get From Dictionary   ${ARGUMENTS[0].unit}                           name
@@ -161,10 +160,6 @@ Set datetime
-
-
-
-
 #### Not reworked for Newtend ####
 Oтримати internal id по UAid
--- a/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @907b22a
+++ b/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @907b22a
@@ -13,7 +13,7 @@ ${question_id}   0
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  tenderid
   log many  @{ARGUMENTS}
-  ${tenders}=  get_internal_id   ${USERS.users['${ARGUMENTS[0]}'].client.get_tenders}      ${USERS.users['${ARGUMENTS[0]}'].creation_date} 
+  ${tenders}=  get_internal_id   ${USERS.users['${ARGUMENTS[0]}'].client.get_tenders}      ${USERS.users['${ARGUMENTS[0]}'].creation_date}
   :FOR  ${tender}  IN  @{tenders}
   \  log  ${tender}
   \  ${internal_id}=  Run Keyword And Return If  '${tender.tenderID}' == '${ARGUMENTS[1]}'      Get Variable Value  ${tender.id}
@@ -26,16 +26,16 @@ ${question_id}   0
 Підготувати клієнт для користувача
   [Arguments]  @{ARGUMENTS}
   [Documentation]  Відкрити брaвзер, створити обєкт api wrapper, тощо
-  ${api_wrapper}=  prepare_api_wrapper  ${USERS.users['${ARGUMENTS[0]}'].api_key}  ${API_HOST_URL}    ${api_version} 
+  ${api_wrapper}=  prepare_api_wrapper  ${USERS.users['${ARGUMENTS[0]}'].api_key}  ${API_HOST_URL}    ${api_version}
   ${creation_date} =   get_date
   Set To Dictionary  ${USERS.users['${ARGUMENTS[0]}']}   creation_date   ${creation_date}
   Set To Dictionary  ${USERS.users['${ARGUMENTS[0]}']}   client  ${api_wrapper}
   Log Variables
-  
-Підготувати дані для оголошення тендера 
+
+Підготувати дані для оголошення тендера
   ${INITIAL_TENDER_DATA}=  prepare_test_tender_data
   [return]   ${INITIAL_TENDER_DATA}
-  
+
 Створити тендер
   [Arguments]  @{ARGUMENTS}
   ${TENDER_DATA}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  create_tender  ${ARGUMENTS[1]}
@@ -61,7 +61,7 @@ ${question_id}   0
   Log   tender_id: ${TENDER_DATA.data.id}
   Set Global Variable  ${TENDER_DATA}
   [return]   ${TENDER_DATA}
-  
+
 Пошук тендера по ідентифікатору
   [Arguments]  @{ARGUMENTS}
   [Documentation]
@@ -191,7 +191,7 @@ ${question_id}   0
   ${complaint}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  _create_tender_resource_item  ${tender}  ${ARGUMENTS[2]}   complaints
   Log object data   ${complaint}  complaint
-порівняти скаргу 
+порівняти скаргу
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  tender_uid
@@ -199,10 +199,10 @@ ${question_id}   0
   [Arguments]  @{ARGUMENTS}
   ${internalid}=  отримати internal id по UAid  ${ARGUMENTS[0]}  ${ARGUMENTS[1]}
   ${tender}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  get_tender  ${internalid}
-  ${complaint}=   Get Variable Value  ${tender.data.complaints[0]}  
+  ${complaint}=   Get Variable Value  ${tender.data.complaints[0]}
   log   ${complaint}
   log   ${ARGUMENTS[2]}
-  #TODO: COMPARE 
+  #TODO: COMPARE
   #Dictionary Should Contain Sub Dictionary   ${complaint}   ${ARGUMENTS[2].data}
   #:FOR  ${element}  IN  ${ARGUMENTS[2].data}
   #\  log  ${element}
@@ -315,9 +315,9 @@ ${question_id}   0
   [return]  ${uploaded_file}
-  
-Завантажити документ  
+
+Завантажити документ
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  filepath
@@ -332,7 +332,7 @@ ${question_id}   0
   ${reply}=  Call Method  ${USERS.users['${ARGUMENTS[0]}'].client}  upload_document  ${tender}  ${ARGUMENTS[1]}
   Log object data   ${reply}  reply
   [return]   ${reply}
- 
+
 Отримати пропозиції
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
--- a/op_robot_tests/tests_files/brokers/publicbid.robot
View file @907b22a
+++ b/op_robot_tests/tests_files/brokers/publicbid.robot
View file @907b22a
@@ -5,10 +5,10 @@ Library  DateTime
 *** Variables ***
 ${file_path}        local_path_to_file("TestDocument.docx")
-# ${file_path}      /home/vbilos/openprocurement.robottests.buildout/Document.docx
 ${mail}          test@mail.com
 ${telephone}     +380976535447
+
 *** Keywords ***
 Підготувати клієнт для користувача
   [Arguments]  @{ARGUMENTS}
@@ -31,23 +31,23 @@ ${telephone}     +380976535447
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  tender_data
-  ${tender_data}=   Add_time_for_GUI_FrontEnds   ${ARGUMENTS[1]}
-  ${items}=         Get From Dictionary   ${tender_data.data}               items
-  ${title}=         Get From Dictionary   ${tender_data.data}               title
-  ${description}=   Get From Dictionary   ${tender_data.data}               description
-  ${budget}=        Get From Dictionary   ${tender_data.data.value}         amount
-  ${step_rate}=     Get From Dictionary   ${tender_data.data.minimalStep}   amount
-  ${countryName}=   Get From Dictionary   ${tender_data.data.procuringEntity.address}       countryName
+  ${prepared_tender_data}=   Add_data_for_GUI_FrontEnds   ${ARGUMENTS[1]}
+  ${items}=         Get From Dictionary   ${prepared_tender_data.data}               items
+  ${title}=         Get From Dictionary   ${prepared_tender_data.data}               title
+  ${description}=   Get From Dictionary   ${prepared_tender_data.data}               description
+  ${budget}=        Get From Dictionary   ${prepared_tender_data.data.value}         amount
+  ${step_rate}=     Get From Dictionary   ${prepared_tender_data.data.minimalStep}   amount
+  ${countryName}=   Get From Dictionary   ${prepared_tender_data.data.procuringEntity.address}       countryName
   ${delivery_end_date}=      Get From Dictionary   ${items[0].deliveryDate}   endDate
   ${delivery_end_date}=      convert_date_to_prom_format   ${delivery_end_date}
-  ${cpv}=           Get From Dictionary   ${items[0].classification}          description_ua
+  ${cpv}=           Convert To String     "Картонки"
   ${cpv_id}=           Get From Dictionary   ${items[0].classification}         id
   ${cpv_id_1}=           Get Substring    ${cpv_id}   0   3
   ${dkpp_desc}=     Get From Dictionary   ${items[0].additionalClassifications[0]}   description
   ${dkpp_id}=       Get From Dictionary   ${items[0].additionalClassifications[0]}  id
   ${code}=           Get From Dictionary   ${items[0].unit}          code
   ${quantity}=      Get From Dictionary   ${items[0]}                        quantity
-  ${name}=      Get From Dictionary   ${tender_data.data.procuringEntity.contactPoint}       name
+  ${name}=      Get From Dictionary   ${prepared_tender_data.data.procuringEntity.contactPoint}       name
   Selenium2Library.Switch Browser     ${ARGUMENTS[0]}
   Wait Until Page Contains Element    xpath=//*[contains(@class, 'ui-button-text ui-c')][./text()='Нова закупівля']   10
--- a/op_robot_tests/tests_files/data/users.yaml
View file @907b22a
+++ b/op_robot_tests/tests_files/data/users.yaml
View file @907b22a
@@ -17,7 +17,7 @@ users:
         homepage: "http://uat.e-tender.biz/#/profile"
         login: Misha2
         password: Password1 
-        browser:  firefox
+        browser:  chrome
         position:  [0, 0]
         size:  [740, 550]
     E-tender_Provider1:
@@ -26,7 +26,7 @@ users:
         homepage: "http://uat.e-tender.biz/#/profile"
         login: st_org
         password: 12345678
-        browser: firefox
+        browser: chrome
         position: [700, 0]
         size: [640, 450]
     E-tender_Provider2:
@@ -35,7 +35,7 @@ users:
         homepage: "http://uat.e-tender.biz/#/profile"
         login: provider2
         password: Qa123456
-        browser:  firefox
+        browser:  chrome
         position:  [700, 0]
         size:  [640, 450]
     E-tender_Viewer:
@@ -80,7 +80,7 @@ users:
         homepage: "http://dev23.newtend.com/openprocurement/#/home/page/1"
         login: openprocurement@mailinator.com
         password: 123123 
-        browser:  firefox
+        browser:  chrome
         position:  [0, 0]
         size:  [640, 450]
     Netcast_Owner:
@@ -89,25 +89,25 @@ users:
         homepage: "http://dz2.byustudio.in.ua"
         login: ovramet.s@gmail.com
         password: Password1
-        browser: firefox
+        browser: chrome
         position:  [0, 0]
-        size:  [1920, 1080]
+        size:  [920, 580]
     Netcast_Provider1:
         broker: Netcast
         username: Netcasttest
         homepage: "http://dz2.byustudio.in.ua"
         login: halyna.khimka@gmail.com 
         password: JHO5VUp5n
-        browser: firefox
-        position:  [0, 450]
-        size:  [1920, 1080]
+        browser: chrome
+        position:  [0, 900]
+        size:  [920, 580]
     Publicbid_Owner:
         broker: Publicbid
         username: Publicbid
         homepage: "https://public-bid.com.ua/test/"
         login: yaroslav1boyko@gmail.com
         password: Password1
-        browser: firefox
+        browser: chrome
         position: [0, 0]
         size: [740, 550]
     Newtend_Provider2:
@@ -116,12 +116,12 @@ users:
         homepage: "http://dev23.newtend.com/openprocurement/tenders"
         login: openprocboss@mailinator.com
         password: 123123
-        browser:  firefox
+        browser:  chrome
         position:  [700, 0]
         size:  [640, 450]
     Newtend_Viewer:
         broker: Newtend
         username: Newtendtest
-        browser:  firefox
+        browser:  chrome
         position:  [0, 0]
         size:  [640, 450]
--- a/op_robot_tests/tests_files/initial_data.py
View file @907b22a
+++ b/op_robot_tests/tests_files/initial_data.py
View file @907b22a
@@ -73,8 +73,7 @@ def test_tender_data(period_interval=2):
             "classification": {
                 "scheme": u"CPV",
                 "id": u"44617100-9",
-                "description": u"Cartons",
-                "description_ua": u"Картонки",
+                "description": u"Cartons"
             },
             "additionalClassifications": [
                 {
@@ -243,8 +242,7 @@ def test_tender_data_multiple_lots(period_interval=2):
             "classification": {
                 "scheme": u"CPV",
                 "id": u"44617100-9",
-                "description": u"Cartons",
-                "description_ua": u"Картонки",
+                "description": u"Cartons"
             },
             "additionalClassifications": [
                 {
--- a/op_robot_tests/tests_files/service_keywords.py
View file @907b22a
+++ b/op_robot_tests/tests_files/service_keywords.py
View file @907b22a
@@ -27,21 +27,6 @@ TIMEZONE = timezone('Europe/Kiev')
 def get_date():
     return datetime.now().isoformat()
-def convert_date_to_slash_format(isodate):
-    iso_dt=parse_date(isodate)
-    date_string = iso_dt.strftime("%d/%m/%Y")
-    return  date_string
-
-def convert_date_to_etender_format(isodate):
-    iso_dt=parse_date(isodate)
-    date_string = iso_dt.strftime("%d-%m-%Y")
-    return  date_string
-
-def convert_time_to_etender_format(isodate):
-    iso_dt=parse_date(isodate)
-    time_string = iso_dt.strftime("%H:%M")
-    return  time_string
-
 def change_state(arguments):
     try:
         if arguments[0] == "shouldfail":
@@ -94,7 +79,6 @@ def load_initial_data_from(file_name):
         elif file_name.endswith(".yaml"):
             return fromYAML(file_obj)
-
 def prepare_test_tender_data(period_interval=2, mode='single'):
     if mode == 'single':
         return munchify({'data': test_tender_data(period_interval=period_interval)})
@@ -102,21 +86,16 @@ def prepare_test_tender_data(period_interval=2, mode='single'):
         return munchify({'data': test_tender_data_multiple_lots(period_interval=period_interval)})
     raise ValueError('A very specific bad thing happened') 
-
 def run_keyword_and_ignore_keyword_definations(name, *args):
     """Runs the given keyword with given arguments and returns the status as a Boolean value.
-
     This keyword returns `True` if the keyword that is executed succeeds and
     `False` if it fails. This is useful, for example, in combination with
     `Run Keyword If`. If you are interested in the error message or return
     value, use `Run Keyword And Ignore Error` instead.
-
     The keyword name and arguments work as in `Run Keyword`.
-
     Example:
     | ${passed} = | `Run Keyword And Return Status` | Keyword | args |
     | `Run Keyword If` | ${passed} | Another keyword |
-
     New in Robot Framework 2.7.6.
     """
     try:
@@ -126,7 +105,6 @@ def run_keyword_and_ignore_keyword_definations(name, *args):
         return "FAIL", ""
     return status, _
-
 def set_tender_periods(tender):
     now = datetime.now()
     tender.data.enquiryPeriod.endDate = (now + timedelta(minutes=2)).isoformat()
@@ -134,17 +112,14 @@ def set_tender_periods(tender):
     tender.data.tenderPeriod.endDate = (now + timedelta(minutes=4)).isoformat()
     return tender
-
 def set_access_key(tender, access_token):
     tender.access = munchify({"token": access_token})
     return tender
-
 def set_to_object(obj, attribute, value):
     xpathset(obj, attribute.replace('.', '/'), value)
     return obj
-
 def get_from_object(obj, attribute):
     """Gets data from a dictionary using a dotted accessor-string"""
     jsonpath_expr = parse_path(attribute)
@@ -153,7 +128,6 @@ def get_from_object(obj, attribute):
         return return_list[0]
     return None
-
 def wait_to_date(date_stamp):
     date = parse(date_stamp)
     LOGGER.log_message(Message("date: {}".format(date.isoformat()), "INFO"))
@@ -165,6 +139,21 @@ def wait_to_date(date_stamp):
         return 0
     return wait_seconds
+def convert_date_to_slash_format(isodate):
+    iso_dt=parse_date(isodate)
+    date_string = iso_dt.strftime("%d/%m/%Y")
+    return  date_string
+
+def convert_date_to_etender_format(isodate):
+    iso_dt=parse_date(isodate)
+    date_string = iso_dt.strftime("%d-%m-%Y")
+    return  date_string
+
+def convert_time_to_etender_format(isodate):
+    iso_dt=parse_date(isodate)
+    time_string = iso_dt.strftime("%H:%M")
+    return  time_string
+
 def newtend_date_picker_index(isodate):
     now = datetime.today()
     date_str = '01' + str(now.month) + str(now.year)
@@ -177,15 +166,15 @@ def newtend_date_picker_index(isodate):
         mod = calendar.monthrange(now.year, now.month)[1] + mod
     return mod + iso_dt.day
-def Add_time_for_GUI_FrontEnds(INITIAL_TENDER_DATA):
+def Add_data_for_GUI_FrontEnds(INITIAL_TENDER_DATA):
     now = datetime.now() 
     INITIAL_TENDER_DATA.data.enquiryPeriod['startDate'] = (now + timedelta(minutes=2)).isoformat()
     INITIAL_TENDER_DATA.data.enquiryPeriod['endDate'] = (now + timedelta(minutes=3)).isoformat()
     INITIAL_TENDER_DATA.data.tenderPeriod['startDate'] = (now + timedelta(minutes=4)).isoformat()
     INITIAL_TENDER_DATA.data.tenderPeriod['endDate'] = (now + timedelta(minutes=5)).isoformat()
     return INITIAL_TENDER_DATA
-
+    
 def local_path_to_file( file_name ):
-   path = os.getcwd()
-   path = path.split("brokers", 1)[0] + "documents/" + file_name
-   return path
+    path = os.getcwd()
+    path = path.split("brokers", 1)[0] + "documents/" + file_name
+    return path
--- a/op_robot_tests/tests_files/singleItemTender.robot
View file @907b22a
+++ b/op_robot_tests/tests_files/singleItemTender.robot
View file @907b22a
@@ -387,7 +387,6 @@ ${question_id}   0
   ${bid_doc_upload_fail}=  Викликати для учасника   ${provider1}   Завантажити документ в ставку   shouldfail   ${filepath}   ${TENDER['TENDER_UAID']}
   Set To Dictionary  ${USERS.users['${provider1}'].bidresponces}   bid_doc_upload_fail   ${bid_doc_upload_fail}
-
 Неможливість змінити існуючу документацію цінової пропозиції після закінчення прийому пропозицій
   [Tags]   ${USERS.users['${provider1}'].broker}:
   ${filepath}=   create_fake_doc
@@ -396,9 +395,8 @@ ${question_id}   0
   ${bid_doc_modified_failed}=  Викликати для учасника   ${provider1}   Змінити документ в ставці  shouldfail  ${filepath}  ${bidid}  ${docid}
   Set To Dictionary  ${USERS.users['${provider}'].bidresponces}   bid_doc_modified_failed   ${bid_doc_modified_failed}
-
 Вичитати цінову пропозицію
-#  sleep  120
+  #sleep  120
   [Tags]   ${USERS.users['${provider1}'].broker}: Можливість подати цінову пропозицію
   ${bidid}=  Get Variable Value  ${USERS.users['${provider1}'].bidresponces['resp'].data.id}
   ${token}=  Get Variable Value  ${USERS.users['${provider1}'].bidresponces['resp'].access.token}