fixed_add_and_answer_question

@@ -90,9 +90,9 @@ ${file_path}     /home/yboi/openprocurement.robottests.buildout/Document.docx
   Click Element   xpath=//div[contains(@class, 'form-actions')]//button[@type='submit']
   Click Element   xpath=//div[contains(@class, 'form-actions')]//button[@type='submit']
   Wait Until Page Contains    [ТЕСТУВАННЯ]   100
   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
   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:
-  ${tender_UAid}=   Convert To String   UA-2015-08-03-000025
+  Sleep   5
+  ${tender_UAid}=  Get Text  xpath=//div[contains(@class, "panel-heading")]
+  ${tender_UAid}=  Get Substring  ${tender_UAid}   7
   ${Ids}=   Convert To String   ${tender_UAid}
   ${Ids}=   Convert To String   ${tender_UAid}
   Run keyword if   '${mode}' == 'multi'   Set Multi Ids   ${ARGUMENTS[0]}   ${tender_UAid}
   Run keyword if   '${mode}' == 'multi'   Set Multi Ids   ${ARGUMENTS[0]}   ${tender_UAid}
   [return]  ${Ids}
   [return]  ${Ids}
@@ -101,26 +101,9 @@ Set Multi Ids
   [Arguments]  @{ARGUMENTS}
   [Arguments]  @{ARGUMENTS}
   [Documentation]
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${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}
   ${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]
-  ...      ${ARGUMENTS[0]} ==  username
-  ...      ${ARGUMENTS[1]} ==  ${tender_UAid}
-  etender.Пошук тендера по ідентифікатору   ${ARGUMENTS[0]}   ${ARGUMENTS[1]}
-  ${current_location}=   Get Location
-  ${tender_id}=   Fetch From Right   ${current_location}   /
-##  harcode Idis bacause issues on the E-tender side, to remove, 1 line:
-  ${tender_id}=     Convert To String   94ffe180019d459787aafe290cd300e2
-  [return]  ${tender_id}
-
 Додати предмет
 Додати предмет
   [Arguments]  @{ARGUMENTS}
   [Arguments]  @{ARGUMENTS}
   [Documentation]
   [Documentation]
@@ -361,17 +344,4 @@ Oтримати internal id по UAid
 отримати інформацію про questions[${question_id}].answer
 отримати інформацію про questions[${question_id}].answer
   відмітити на сторінці поле з тендера   question answer   jquery=tender-questions>div:eq(1)>div:last>
   відмітити на сторінці поле з тендера   question answer   jquery=tender-questions>div:eq(1)>div:last>
   ${return_value}=   Get Text  jquery=tender-questions>div:eq(1)>div:last>
   ${return_value}=   Get Text  jquery=tender-questions>div:eq(1)>div:last>
-  [return]  ${return_value}
-
-
-Завантажити документ
-  [Arguments]  @{ARGUMENTS}
-  [Documentation]
-  ...      ${ARGUMENTS[0]} = username
-  ...      ${ARGUMENTS[1]} = filename
-  ...      ${ARGUMENTS[2]} = ${TENDER_ID}
-
-  Selenium2Library.Switch Browser    ${ARGUMENTS[0]}
-  etender.Пошук тендера по ідентифікатору   ${ARGUMENTS[0]}   ${ARGUMENTS[2]}   ${TENDER_ID}
-  Wait Until Page Contains Element   xpath=//button[text()="Завантажити"]   100
-  Choose File                        xpath=//button[text()="Завантажити"]   ${file_path}
+  [return]  ${return_value}

@@ -124,4 +124,13 @@ users:
         username: Newtendtest
         username: Newtendtest
         browser:  firefox
         browser:  firefox
         position:  [0, 0]
         position:  [0, 0]
+        size:  [640, 450]
+    E-tender_Viewer1:
+        broker: E-tender
+        username: E-tendertest
+        homepage: "http://uat.e-tender.biz/#/profile"
+        login: provider2
+        password: Qa123456
+        browser:  firefox
+        position:  [720, 0]
         size:  [640, 450]
         size:  [640, 450]