Merge branch 'pc2' into pc2y

biviktorqc
2 parents eabeee5f c9bc870a
Showing 9 changed files with 162 additions and 126 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 @1cfdd4a
+++ b/op_robot_tests/tests_files/brokers/etender.robot
View file @1cfdd4a
@@ -27,30 +27,30 @@ ${file_path}     /home/yboi/openprocurement.robottests.buildout/Document.docx
   [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
@@ -344,4 +344,4 @@ Set Multi Ids
 отримати інформацію про questions[${question_id}].answer
   відмітити на сторінці поле з тендера   question answer   jquery=tender-questions>div:eq(1)>div:last>
   ${return_value}=   Get Text  jquery=tender-questions>div:eq(1)>div:last>
-  [return]  ${return_value}
+  [return]  ${return_value}
--- a/op_robot_tests/tests_files/brokers/netcast.robot
View file @1cfdd4a
+++ b/op_robot_tests/tests_files/brokers/netcast.robot
View file @1cfdd4a
@@ -41,26 +41,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]}
@@ -191,15 +191,56 @@ Set Multi Ids
   ${current_location}=   Get Location
   Run keyword if   '${BROKERS['${USERS.users['${username}'].broker}'].url}/#/tenderDetailes/${ARGUMENTS[2]}'=='${current_location}'  Reload Page
   Go to   ${BROKERS['${USERS.users['${username}'].broker}'].url}
-  Wait Until Page Contains   E-TENDER - центр електронної торгівлі   10
-  sleep  1
-  Input Text  jquery=input[ng-change='search()']  ${ARGUMENTS[1]}
-  Click Link  jquery=a[ng-click='search()']
-  sleep  2
-  ${last_note_id}=  Add pointy note   jquery=a[href^="#/tenderDetailes"]   Found tender with tenderID "${ARGUMENTS[1]}"   width=200  position=bottom
-  sleep  1
-  Remove element   ${last_note_id}
-  Click Link    jquery=a[href^="#/tenderDetailes"]
+  Wait Until Page Contains            Держзакупівлі.онлайн   10
+#  sleep  1
+  Click Element                       xpath=//a[text()='Закупівлі']
+  Click Element                       xpath=//select[@name='filter[object]']/option[@value='tenderID']
+  Input text                          xpath=//input[@name='filter[search]']  ${ARGUMENTS[1]}
+  Click Element                       xpath=//button[@class='btn'][./text()='Пошук']
   Wait Until Page Contains    ${ARGUMENTS[1]}   10
   sleep  1
-  Capture Page Screenshot
+  Capture Page Screenshot
+
+Задати питання
+  [Arguments]  @{ARGUMENTS}
+  [Documentation]
+  ...      ${ARGUMENTS[0]} ==  username
+  ...      ${ARGUMENTS[1]} ==  tenderId
+  ...      ${ARGUMENTS[2]} ==  id
+  ${title}=        Get From Dictionary  ${ARGUMENTS[2].data}  title
+  ${description}=  Get From Dictionary  ${ARGUMENTS[2].data}  description
+
+  Selenium2Library.Switch Browser    ${ARGUMENTS[0]}
+  netcast.Пошук тендера по ідентифікатору    ${ARGUMENTS[0]}   ${ARGUMENTS[1]}   ${TENDER_ID}
+
+  Click Element                       xpath=//a[@class='reverse tenderLink']
+  Wait Until Page Contains Element    xpath=//a[@class='reverse openCPart'][span[text()='Обговорення']]    20
+  Click Element                       xpath=//a[@class='reverse openCPart'][span[text()='Обговорення']]
+  Wait Until Page Contains Element    name=title
+  Input text                          name=title                 ${title}
+  Input text                          xpath=//textarea[@name='description']           ${description}
+  Click Element                       xpath=//div[contains(@class, 'buttons')]//button[@type='submit']
+  Wait Until Page Contains            ${title}   30
+  Capture Page Screenshot
+
+Відповісти на питання
+  [Arguments]  @{ARGUMENTS}
+  [Documentation]
+  ...      ${ARGUMENTS[0]} = username
+  ...      ${ARGUMENTS[1]} = ${INTERNAL_TENDER_ID}
+  ...      ${ARGUMENTS[2]} = 0
+  ...      ${ARGUMENTS[3]} = answer_data
+
+  ${answer}=     Get From Dictionary  ${ARGUMENTS[3].data}  answer
+  Selenium2Library.Switch Browser    ${ARGUMENTS[0]}
+  netcast.Пошук тендера по ідентифікатору   ${ARGUMENTS[0]}   ${ARGUMENTS[1]}   ${TENDER_ID}
+
+  Click Element                      xpath=//a[@class='reverse tenderLink']
+  Click Element                      xpath=//a[@class='reverse openCPart'][span[text()='Обговорення']]
+  Input text                         xpath=//textarea[@name='answer']            ${answer}
+  Click Element                      xpath=//div[1]/div[3]/form/div/table/tbody/tr/td[2]/button
+  Wait Until Page Contains           ${answer}   30
+  Capture Page Screenshot
+
+#  KEYWORD: BuiltIn.Log ${TENDER}
+#  18:11:57.979  INFO  {u'LAST_MODIFICATION_DATE': '2015-08-11 18:11:57.974', u'TENDER_UAID': u'UA-2015-08-11-000050'}
--- a/op_robot_tests/tests_files/brokers/newtend.robot
View file @1cfdd4a
+++ b/op_robot_tests/tests_files/brokers/newtend.robot
View file @1cfdd4a
@@ -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 @1cfdd4a
+++ b/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @1cfdd4a
@@ -9,11 +9,11 @@ ${question_id}   0
 *** Keywords ***
 отримати internal id по UAid
   [Arguments]  @{ARGUMENTS}
-  [Documentation]  
+  [Documentation]
   ...      ${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 @1cfdd4a
+++ b/op_robot_tests/tests_files/brokers/publicbid.robot
View file @1cfdd4a
@@ -32,23 +32,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 @1cfdd4a
+++ b/op_robot_tests/tests_files/data/users.yaml
View file @1cfdd4a
@@ -90,17 +90,17 @@ users:
         login: ovramet.s@gmail.com
         password: Password1
         browser: firefox
-        position:  [0, 450]
-        size:  [640, 450]
-    Newtend_Provider1:
-        broker: Newtend
-        username: Newtendtest
-        homepage: "http://dev23.newtend.com/openprocurement/tenders"
-        login: qtest@mailinator.com
-        password: 123123
+        position:  [0, 0]
+        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:  [640, 450]
+        position:  [0, 900]
+        size:  [920, 580]
     Publicbid_Owner:
         broker: Publicbid
         username: Publicbid
--- a/op_robot_tests/tests_files/initial_data.py
View file @1cfdd4a
+++ b/op_robot_tests/tests_files/initial_data.py
View file @1cfdd4a
@@ -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": [
                 {
@@ -278,8 +276,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": [
                 {
@@ -313,8 +310,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": [
                 {
@@ -348,8 +344,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 @1cfdd4a
+++ b/op_robot_tests/tests_files/service_keywords.py
View file @1cfdd4a
-#!/usr/bin/env python
 # -*- coding: utf-8 -
 import os
 from munch import munchify, Munch, fromYAML
@@ -27,21 +26,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 +78,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 +85,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 +104,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 +111,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 +127,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"))
@@ -164,6 +137,22 @@ def wait_to_date(date_stamp):
     if wait_seconds < 0:
         return 0
     return wait_seconds
+#!/usr/bin/env python
+
+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()
@@ -177,10 +166,28 @@ 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()
+
+##len(dict.items()[0])
+##len(dict[key])
+
+     
+    #LOGGER.log_message(Message("itemsss: {}".format(INITIAL_TENDER_DATA.data.items[0]), "INFO")) 
+
+    #item_len = len(INITIAL_TENDER_DATA.data.items)
+
+    #LOGGER.log_message(Message("item_len: {}".format(item_len), "INFO")) 
+
+    #for i in range(len(INITIAL_TENDER_DATA.data.items)):
+    #dict.update(INITIAL_TENDER_DATA.data.items.classification['description_ua'] = "Картонки"
+#    INITIAL_TENDER_DATA.data.items.classification.update({'description_ua': 'Картонки'})
+
+#    for itm in INITIAL_TENDER_DATA.data.items:
+#        itm.classification['description_ua'] = u"Картонки"
+
     return INITIAL_TENDER_DATA
--- a/op_robot_tests/tests_files/singleItemTender.robot
View file @1cfdd4a
+++ b/op_robot_tests/tests_files/singleItemTender.robot
View file @1cfdd4a
@@ -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}