Merge branch 'pc2' of git://github.com/SavchukRoman/robot_tests into pc2r

Conflicts:
	op_robot_tests/tests_files/brokers/netcast.robot
	op_robot_tests/tests_files/data/users.yaml

@@ -5,6 +5,7 @@ Library  DateTime
 
 *** Variables ***
 ${locator.tenderId}                  jquery=h3
+${file_path}                         local_path_to_file("TestDocument.docx")
 
 *** Keywords ***
 Підготувати клієнт для користувача
@@ -109,6 +110,12 @@ Set Multi Ids
   ${id}=    Get Text   xpath=//*/section[6]/table/tbody/tr[1]/td[2]
   ${Ids}=   Create List    ${tender_UAid}   ${id}
 
+Get Rough Copy Tender Id
+  [Arguments]  @{ARGUMENTS}
+  ${tender_id}=   Get Text          xpath=//*/section[6]/table/tbody/tr[2]/td[2]
+  ${tender_UA_ID}=   Convert To String         ${tender_UAid}
+  [return]  ${tender_UA_ID}
+
 Додати предмет
   [Arguments]  @{ARGUMENTS}
   [Documentation]
@@ -189,7 +196,6 @@ Set Multi Ids
   Switch browser   ${ARGUMENTS[0]}
   Go to   ${BROKERS['${USERS.users['${username}'].broker}'].url}
   Wait Until Page Contains            Держзакупівлі.онлайн   10
-#  sleep  1
   Click Element                       xpath=//a[text()='Закупівлі']
   sleep  5
   Click Element                       xpath=//select[@name='filter[object]']/option[@value='tenderID']
@@ -214,7 +220,7 @@ Set Multi Ids
   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
+  Wait Until Page Contains Element    name=title    20
   Input text                          name=title                 ${title}
   Input text                          xpath=//textarea[@name='description']           ${description}
   Click Element                       xpath=//div[contains(@class, 'buttons')]//button[@type='submit']
@@ -230,14 +236,55 @@ Set Multi Ids
   ...      ${ARGUMENTS[3]} = answer_data
 
   ${answer}=     Get From Dictionary  ${ARGUMENTS[3].data}  answer
+  Selenium2Library.Switch Browser     ${ARGUMENTS[0]}
+  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
+  Click Element                       xpath=//a[@class='reverse openCPart'][span[text()='Обговорення']]
+  Wait Until Page Contains Element    xpath=//textarea[@name='answer']    20
+  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
+
+Подати скаргу
+  [Arguments]  @{ARGUMENTS}
+  [Documentation]
+  ...      ${ARGUMENTS[0]} = username
+  ...      ${ARGUMENTS[1]} = tenderUaId
+
+  ${complaint}=        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]}
+  Click Element                      xpath=//a[@class='reverse tenderLink']
+  sleep  5
+  Click Element                      xpath=//a[@class='reverse openCPart'][span[text()='Скарги']]
+  Wait Until Page Contains Element   name=title    20
+  Input text                         name=title                 ${complaint}
+  Input text                         xpath=//textarea[@name='description']           ${description}
+  Click Element                      xpath=//div[contains(@class, 'buttons')]//button[@type='submit']
+  Wait Until Page Contains           ${complaint}   30
+  Capture Page Screenshot
 
+Внести зміни в тендер
+  [Arguments]  @{ARGUMENTS}
+  [Documentation]
+  ...      ${ARGUMENTS[0]} = username
+  ...      ${ARGUMENTS[1]} = tenderUaId
+  Selenium2Library.Switch Browser    ${ARGUMENTS[0]}
+  Click Element                      xpath=//a[@class='reverse'][./text()='Мої закупівлі']
+  Wait Until Page Contains Element   xpath=//a[@class='reverse'][./text()='Чернетки']   30
+  Click Element                      xpath=//a[@class='reverse'][./text()='Чернетки']
+  Wait Until Page Contains Element   xpath=//a[@class='reverse tenderLink']    30
   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   xpath=//textarea[@name='answer']   20
-  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
+  sleep  1
+  Click Element                      xpath=//a[@class='button save'][./text()='Редагувати']
+  sleep  1
+  Input text                         name=tender_title   "Some new title"
+  sleep  1
+  Click Element                      xpath=//button[@class='saveDraft']
+  Wait Until Page Contains           "Some new title"   30
   Capture Page Screenshot
\ No newline at end of file

@@ -19,7 +19,7 @@ users:
         password: Password1 
         browser:  firefox
         position:  [0, 0]
-        size:  [740, 550]
+        size:  [800, 800]
     E-tender_Provider1:
         broker: E-tender
         username: E-tendertest
@@ -28,7 +28,7 @@ users:
         password: 12345678
         browser: firefox
         position: [700, 0]
-        size: [640, 450]
+        size: [700, 800]
     E-tender_Provider2:
         broker: E-tender
         username: E-tendertest
@@ -91,7 +91,7 @@ users:
         password: Password1
         browser: chrome
         position:  [0, 0]
-        size:  [600, 800]
+        size:  [700, 800]
     Netcast_Provider1:
         broker: Netcast
         username: Netcasttest
@@ -100,7 +100,7 @@ users:
         password: JHO5VUp5n
         browser: chrome
         position:  [0, 0]
-        size:  [640, 450]
+        size:  [600, 800]
     Publicbid_Owner:
         broker: Publicbid
         username: Publicbid