Merge branch 'pc2' into pc2y

Conflicts: op_robot_tests/tests_files/brokers/publicbid.robot

Merge branch 'pc2' into pc2y
Conflicts: op_robot_tests/tests_files/brokers/publicbid.robot
biviktorqc
2 parents 9eba9c34 0ebd3cae
Showing 6 changed files with 32 additions and 42 deletions
op_robot_tests/tests_files/brokers/etender.robot
op_robot_tests/tests_files/brokers/netcast.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
--- a/op_robot_tests/tests_files/brokers/etender.robot
View file @59886f6
+++ b/op_robot_tests/tests_files/brokers/etender.robot
View file @59886f6
@@ -117,6 +117,16 @@ Set Multi Ids
   ${id}=   Get Text  xpath=//div[contains(@class, "panel-heading")]
   ${Ids}=   Create List    ${tender_UAid}   ${id}
+Oтримати internal id по UAid
+  [Arguments]  @{ARGUMENTS}
+  [Documentation]
+  ...      ${ARGUMENTS[0]} ==  username
+  ...      ${ARGUMENTS[1]} ==  ${tender_UAid}
+  etender.Пошук тендера по ідентифікатору   ${ARGUMENTS[0]}   ${ARGUMENTS[1]}
+  ${current_location}=   Get Location
+  ${tender_id}=   Fetch From Right   ${current_location}   /
+  [return]  ${tender_id}
+
 Додати предмет
   [Arguments]  @{ARGUMENTS}
   [Documentation]
--- a/op_robot_tests/tests_files/brokers/netcast.robot
View file @59886f6
+++ b/op_robot_tests/tests_files/brokers/netcast.robot
View file @59886f6
@@ -186,10 +186,7 @@ Set Multi Ids
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  tenderId
-  ...      ${ARGUMENTS[2]} ==  id
   Switch browser   ${ARGUMENTS[0]}
-  ${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            Держзакупівлі.онлайн   10
 #  sleep  1
@@ -205,13 +202,13 @@ Set Multi Ids
   [Arguments]  @{ARGUMENTS}
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
-  ...      ${ARGUMENTS[1]} ==  tenderId
-  ...      ${ARGUMENTS[2]} ==  id
+  ...      ${ARGUMENTS[1]} ==  tenderUaId
+  ...      ${ARGUMENTS[2]} ==  questionId
   ${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}
+  netcast.Пошук тендера по ідентифікатору    ${ARGUMENTS[0]}   ${ARGUMENTS[1]}
   Click Element                       xpath=//a[@class='reverse tenderLink']
   Wait Until Page Contains Element    xpath=//a[@class='reverse openCPart'][span[text()='Обговорення']]    20
@@ -227,20 +224,17 @@ Set Multi Ids
   [Arguments]  @{ARGUMENTS}
   [Documentation]
   ...      ${ARGUMENTS[0]} = username
-  ...      ${ARGUMENTS[1]} = ${INTERNAL_TENDER_ID}
+  ...      ${ARGUMENTS[1]} = tenderUaId
   ...      ${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}
+  netcast.Пошук тендера по ідентифікатору   ${ARGUMENTS[0]}   ${ARGUMENTS[1]}
   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'}
+  Capture Page Screenshot
--- a/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @59886f6
+++ b/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @59886f6
@@ -9,7 +9,7 @@ ${question_id}   0
 *** Keywords ***
 отримати internal id по UAid
   [Arguments]  @{ARGUMENTS}
-  [Documentation]
+  [Documentation]  
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  tenderid
   log many  @{ARGUMENTS}
--- a/op_robot_tests/tests_files/brokers/publicbid.robot
View file @59886f6
+++ b/op_robot_tests/tests_files/brokers/publicbid.robot
View file @59886f6
@@ -4,12 +4,11 @@ Library  String
 Library  DateTime
 *** Variables ***
-##Використовую такий шлях у кожного буде мінятись /yboi/. Міняйте на сві шлях до файлу
-#${file_path}     /home/yboi/openprocurement.robottests.buildout/Document.docx
-${file_path}      /home/yboi/openprocurement.robottests.buildout/Document.docx
+${file_path}        local_path_to_file("TestDocument.docx")
 ${mail}          test@mail.com
 ${telephone}     +380976535447
+
 *** Keywords ***
 Підготувати клієнт для користувача
   [Arguments]  @{ARGUMENTS}
--- a/op_robot_tests/tests_files/data/users.yaml
View file @59886f6
+++ b/op_robot_tests/tests_files/data/users.yaml
View file @59886f6
@@ -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:
@@ -81,9 +81,9 @@ 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]
+        size:  [1100, 1000]
     Netcast_Owner:
         broker: Netcast
         username: Netcasttest
@@ -99,7 +99,7 @@ users:
         homepage: "http://dz2.byustudio.in.ua"
         login: halyna.khimka@gmail.com 
         password: JHO5VUp5n
-        browser: firefox
+        browser: chrome
         position:  [0, 900]
         size:  [920, 580]
     Publicbid_Owner:
@@ -117,12 +117,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/service_keywords.py
View file @59886f6
+++ b/op_robot_tests/tests_files/service_keywords.py
View file @59886f6
+#!/usr/bin/env python
 # -*- coding: utf-8 -
 import os
 from munch import munchify, Munch, fromYAML
@@ -137,7 +138,6 @@ 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)
@@ -172,22 +172,9 @@ def Add_data_for_GUI_FrontEnds(INITIAL_TENDER_DATA):
     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
+    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