tune up time intervals

biviktorqc
1 parent 1def7b48
Showing 7 changed files with 251 additions and 87 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/publicbid.robot
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 @f3c95be
+++ b/op_robot_tests/tests_files/brokers/etender.robot
View file @f3c95be
@@ -7,10 +7,6 @@ Library  DateTime
 ${locator.tenderId}                  jquery=h3
 *** Keywords ***
-Підготувати дані для оголошення тендера
-  ${INITIAL_TENDER_DATA}=  prepare_test_tender_data
-  [return]   ${INITIAL_TENDER_DATA}
-
 Підготувати клієнт для користувача
   [Arguments]  @{ARGUMENTS}
   [Documentation]  Відкрити брaвзер, створити обєкт api wrapper, тощо
@@ -18,7 +14,6 @@ ${locator.tenderId}                  jquery=h3
   Open Browser   ${USERS.users['${ARGUMENTS[0]}'].homepage}   ${USERS.users['${username}'].browser}   alias=${ARGUMENTS[0]}
   Set Window Size   @{USERS.users['${ARGUMENTS[0]}'].size}
   Set Window Position   @{USERS.users['${ARGUMENTS[0]}'].position}
-
 # login
   Wait Until Page Contains Element   id=inputUsername   100
   Input text   id=inputUsername      ${USERS.users['${username}'].login}
@@ -31,31 +26,30 @@ ${locator.tenderId}                  jquery=h3
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  tender_data
-
-  ${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
-  ${items_description}=   Get From Dictionary   ${ARGUMENTS[1].data}         description
+  ${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
   ${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   ${ARGUMENTS[1].data.tenderPeriod}   startDate
+  ${start_date}=    Get From Dictionary   ${tender_data.data.tenderPeriod}   startDate
   ${start_date}=    convert_date_to_etender_format   ${start_date}
-  ${start_time}=    Get From Dictionary   ${ARGUMENTS[1].data.tenderPeriod}   startDate
+  ${start_time}=    Get From Dictionary   ${tender_data.data.tenderPeriod}   startDate
   ${start_time}=    convert_time_to_etender_format   ${start_time}
-  ${end_date}=      Get From Dictionary   ${ARGUMENTS[1].data.tenderPeriod}   endDate
+  ${end_date}=      Get From Dictionary   ${tender_data.data.tenderPeriod}   endDate
   ${end_date}=      convert_date_to_etender_format   ${end_date}
-  ${end_time}=      Get From Dictionary   ${ARGUMENTS[1].data.tenderPeriod}   endDate
+  ${end_time}=      Get From Dictionary   ${tender_data.data.tenderPeriod}   endDate
   ${end_time}=   convert_time_to_etender_format      ${end_time}
-  ${enquiry_end_date}=   Get From Dictionary         ${ARGUMENTS[1].data.enquiryPeriod}   endDate
+  ${enquiry_end_date}=   Get From Dictionary         ${tender_data.data.enquiryPeriod}   endDate
   ${enquiry_end_date}=   convert_date_to_etender_format   ${enquiry_end_date}
-  ${enquiry_end_time}=   Get From Dictionary              ${ARGUMENTS[1].data.enquiryPeriod}   endDate
+  ${enquiry_end_time}=   Get From Dictionary              ${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
   Click Element                     xpath=//a[contains(@class, 'ng-binding')][./text()='Мої закупівлі']
@@ -97,10 +91,18 @@ ${locator.tenderId}                  jquery=h3
   ${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
-  ${id}=   Oтримати internal id по UAid   ${ARGUMENTS[0]}   ${tender_UAid}
-  ${Ids}   Create List    ${tender_UAid}   ${id}
+  ${Ids}=   Convert To String   ${tender_UAid}
+  Run keyword if   '${mode}' == 'multi'   Set Multi Ids   ${ARGUMENTS[0]}   ${tender_UAid}
   [return]  ${Ids}
+Set Multi Ids
+  [Arguments]  @{ARGUMENTS}
+  [Documentation]
+  ...      ${ARGUMENTS[0]} ==  username
+  ...      ${ARGUMENTS[1]} ==  ${tender_UAid}
+  ${id}=   Oтримати internal id по UAid   ${ARGUMENTS[0]}   ${ARGUMENTS[1]}
+  ${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
@@ -109,13 +111,12 @@ Oтримати internal id по UAid
   [Arguments]  @{ARGUMENTS}
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
-  ...      ${ARGUMENTS[1]} ==  tenderid
+  ...      ${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
-  log  ${tender_id}
   [return]  ${tender_id}
 Додати предмет
@@ -161,8 +162,7 @@ Oтримати internal id по UAid
   [Arguments]  @{ARGUMENTS}
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
-  ...      ${ARGUMENTS[1]} ==  tenderId
-
+  ...      ${ARGUMENTS[1]} ==  ${TENDER_UAID}
   Switch browser   ${ARGUMENTS[0]}
   Go to   ${BROKERS['${USERS.users['${username}'].broker}'].url}
   Wait Until Page Contains   Список закупівель    10
@@ -179,7 +179,7 @@ Oтримати internal id по UAid
   [Arguments]  @{ARGUMENTS}
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
-  ...      ${ARGUMENTS[1]} ==  ${INTERNAL_TENDER_ID}
+  ...      ${ARGUMENTS[1]} ==  ${TENDER_UAID}
   ...      ${ARGUMENTS[2]} ==  test_bid_data
   ${bid}=        Get From Dictionary   ${ARGUMENTS[2].data.value}         amount
@@ -193,14 +193,14 @@ Oтримати internal id по UAid
   [Arguments]  @{ARGUMENTS}
   [Documentation]
   ...      ${ARGUMENTS[0]} = username
-  ...      ${ARGUMENTS[1]} = ${INTERNAL_TENDER_ID}
+  ...      ${ARGUMENTS[1]} = ${TENDER_UAID}
   ...      ${ARGUMENTS[2]} = question_data
   ${title}=        Get From Dictionary  ${ARGUMENTS[2].data}  title
   ${description}=  Get From Dictionary  ${ARGUMENTS[2].data}  description
   Selenium2Library.Switch Browser    ${ARGUMENTS[0]}
-  etender.Пошук тендера по ідентифікатору   ${ARGUMENTS[0]}   ${ARGUMENTS[1]}   ${TENDER_ID}
+  etender.Пошук тендера по ідентифікатору   ${ARGUMENTS[0]}   ${ARGUMENTS[1]}
   Wait Until Page Contains Element   jquery=a[href^="#/addQuestion/"]   100
   Click Element                      jquery=a[href^="#/addQuestion/"]
@@ -213,14 +213,14 @@ Oтримати internal id по UAid
   [Arguments]  @{ARGUMENTS}
   [Documentation]
   ...      ${ARGUMENTS[0]} = username
-  ...      ${ARGUMENTS[1]} = ${INTERNAL_TENDER_ID}
+  ...      ${ARGUMENTS[1]} = ${TENDER_UAID}
   ...      ${ARGUMENTS[2]} = 0
   ...      ${ARGUMENTS[3]} = answer_data
   ${answer}=     Get From Dictionary  ${ARGUMENTS[3].data}  answer
   Selenium2Library.Switch Browser    ${ARGUMENTS[0]}
-  etender.Пошук тендера по ідентифікатору   ${ARGUMENTS[0]}   ${ARGUMENTS[1]}   ${TENDER_ID}
+  etender.Пошук тендера по ідентифікатору   ${ARGUMENTS[0]}   ${ARGUMENTS[1]}
   Click Element                      xpath=//div[div/pre[1]]/div[1]
   Input text                         xpath=//div[textarea]/textarea            ${answer}
--- a/op_robot_tests/tests_files/brokers/netcast.robot
View file @f3c95be
+++ b/op_robot_tests/tests_files/brokers/netcast.robot
View file @f3c95be
@@ -14,16 +14,11 @@ ${locator.tenderId}                  jquery=h3
   Open Browser   ${BROKERS['${USERS.users['${ARGUMENTS[0]}'].broker}'].url}   ${USERS.users['${ARGUMENTS[0]}'].browser}   alias=${ARGUMENTS[0]}
   Set Window Size       @{USERS.users['${ARGUMENTS[0]}'].size}
   Set Window Position   @{USERS.users['${ARGUMENTS[0]}'].position}
-
-# login
-#  Wait Until Page Contains Element   name=siteLogin   100
-#  Input text    name=siteLogin      ${BROKERS['${USERS.users['${username}'].broker}'].login}
-#  Input text   name=sitePass       ${BROKERS['${USERS.users['${username}'].broker}'].password}
-#  Click Button   xpath=.//*[@id='table1']/tbody/tr/td/form/p[3]/input
+  Run Keyword And Ignore Error   Pre Login   ${ARGUMENTS[0]}
   Wait Until Page Contains Element    jquery=a[href="/cabinet"]
   Click Element                       jquery=a[href="/cabinet"]
-  Wait Until Page Contains Element    name=email   100
+  Wait Until Page Contains Element    name=email   10
   Input text    name=email     mail
   Sleep  1
   Input text    name=email      ${USERS.users['${username}'].login}
@@ -32,20 +27,29 @@ ${locator.tenderId}                  jquery=h3
   Wait Until Page Contains Element   xpath=//button[contains(@class, 'btn')][./text()='Вхід в кабінет']   100
   Click Element                xpath=//button[contains(@class, 'btn')][./text()='Вхід в кабінет']
+Pre Login
+  [Arguments]  @{ARGUMENTS}
+  [Documentation]
+  ...    ${ARGUMENTS[0]} ==  username
+  Wait Until Page Contains Element   name=siteLogin   10
+  Input text    name=siteLogin      ${BROKERS['${USERS.users['${username}'].broker}'].login}
+  Input text   name=sitePass       ${BROKERS['${USERS.users['${username}'].broker}'].password}
+  Click Button   xpath=.//*[@id='table1']/tbody/tr/td/form/p[3]/input
+
 Створити тендер
   [Arguments]  @{ARGUMENTS}
   [Documentation]
   ...      ${ARGUMENTS[0]} ==  username
   ...      ${ARGUMENTS[1]} ==  tender_data
-
-  ${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
-  ${items_description}=   Get From Dictionary   ${ARGUMENTS[1].data}         description
+  ${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
   ${quantity}=      Get From Dictionary   ${items[0]}         quantity
-  ${countryName}=   Get From Dictionary   ${ARGUMENTS[1].data.procuringEntity.address}       countryName
+  ${countryName}=   Get From Dictionary   ${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
@@ -54,9 +58,9 @@ ${locator.tenderId}                  jquery=h3
   ${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         ${ARGUMENTS[1].data.enquiryPeriod}   endDate
+  ${enquiry_end_date}=   Get From Dictionary         ${tender_data.data.enquiryPeriod}   endDate
   ${enquiry_end_date}=   convert_date_to_slash_format   ${enquiry_end_date}
-  ${end_date}=      Get From Dictionary   ${ARGUMENTS[1].data.tenderPeriod}   endDate
+  ${end_date}=      Get From Dictionary   ${tender_data.data.tenderPeriod}   endDate
   ${end_date}=      convert_date_to_slash_format   ${end_date}
   Selenium2Library.Switch Browser     ${ARGUMENTS[0]}
@@ -93,11 +97,18 @@ ${locator.tenderId}                  jquery=h3
   Wait Until Page Contains Element    xpath=//a[contains(@class, 'button pubBtn')]    100
   Click Element                       xpath=//a[contains(@class, 'button pubBtn')]
   Wait Until Page Contains            Тендер опубліковано    100
-  ${tender_UAid}=  Get Text           xpath=//*/section[6]/table/tbody/tr[2]/td[2]
-  ${id}=           Get Text           xpath=//*/section[6]/table/tbody/tr[1]/td[2]
-  ${Ids}   Create List    ${tender_UAid}   ${id}
+  ${tender_UAid}=   Get Text          xpath=//*/section[6]/table/tbody/tr[2]/td[2]
+  ${Ids}=   Convert To String         ${tender_UAid}
+  Run keyword if   '${mode}' == 'multi'   Set Multi Ids   ${tender_UAid}
   [return]  ${Ids}
+Set Multi Ids
+  [Arguments]  @{ARGUMENTS}
+  [Documentation]
+  ...      ${ARGUMENTS[1]} ==  ${tender_UAid}
+  ${id}=    Get Text   xpath=//*/section[6]/table/tbody/tr[1]/td[2]
+  ${Ids}=   Create List    ${tender_UAid}   ${id}
+
 Додати предмет
   [Arguments]  @{ARGUMENTS}
   [Documentation]
--- a/op_robot_tests/tests_files/brokers/newtend.robot
View file @f3c95be
+++ b/op_robot_tests/tests_files/brokers/newtend.robot
View file @f3c95be
@@ -70,11 +70,17 @@ ${locator.tenderId}                  jquery=h3
 # Get Ids
   Wait Until Page Contains Element   xpath=//div[@class="title"]   30
   ${tender_UAid}=         Get Text   xpath=//div[@class="title"]
-  ${current_location}=               Get Location
-  ${tender_id}=      Get Substring   ${current_location}   -41   -9
-  ${Ids}               Create List   ${tender_UAid}   ${tender_id}
+  ${Ids}=        Convert To String   ${tender_UAid}
+  Run keyword if   '${mode}' == 'multi'   Set Multi Ids   ${tender_UAid}
   [return]  ${Ids}
+Set Multi Ids
+  [Arguments]  @{ARGUMENTS}
+  [Documentation]
+  ...      ${ARGUMENTS[0]} ==  ${tender_UAid}
+  ${current_location}=      Get Location
+  ${id}=    Get Substring   ${current_location}   -41   -9
+  ${Ids}=   Create List     ${tender_UAid}   ${id}
 Set datetime
   [Arguments]  @{ARGUMENTS}
--- a/op_robot_tests/tests_files/brokers/publicbid.robot
View file @f3c95be
+++ b/op_robot_tests/tests_files/brokers/publicbid.robot
View file @f3c95be
-  *** Setting ***
+*** Setting ***
 Library  Selenium2Screenshots
 Library  String
 Library  DateTime
+*** Variables ***
+##Використовую такий шлях у кожного буде мінятись /yboi/. Міняйте на сві шлях до файлу
+#${file_path}     /home/yboi/openprocurement.robottests.buildout/Document.docx
+${file_path}      /home/vbilos/openprocurement.robottests.buildout/Document.docx
+${mail}          test@mail.com
+${telephone}     +380976535447
+
 *** Keywords ***
 Підготувати клієнт для користувача
-  [Arguments]  ${username}
+  [Arguments]  @{ARGUMENTS}
   [Documentation]  Відкрити брaвзер, створити обєкт api wrapper, тощо
-  Open Browser   ${BROKERS['${USERS.users['${username}'].broker}'].url}   ${USERS.users['${username}'].browser}   alias=${username}
-  Set Window Position   @{USERS.users['${username}'].position}
-  Set Window Size       @{USERS.users['${username}'].size}
-  Log Variables
+  ...      ${ARGUMENTS[0]} ==  username
+  Open Browser   ${USERS.users['${ARGUMENTS[0]}'].homepage}   ${USERS.users['${username}'].browser}   alias=${ARGUMENTS[0]}
+  Set Window Size   @{USERS.users['${ARGUMENTS[0]}'].size}
+  Set Window Position   @{USERS.users['${ARGUMENTS[0]}'].position}
+
+# login
+  Run Keyword And Ignore Error   Wait Until Page Contains Element    id=mForm:j_idt54   10
+  Click Element                      id=mForm:j_idt54
+  Run Keyword And Ignore Error   Wait Until Page Contains Element   id=mForm:email   10
+  Input text   id=mForm:email      ${USERS.users['${username}'].login}
+  Input text   id=mForm:pwd      ${USERS.users['${username}'].password}
+  Click Button   id=mForm:login
+
+Створити тендер
+  [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
+  ${countryName}=   Get From Dictionary   ${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_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
+
+  Selenium2Library.Switch Browser     ${ARGUMENTS[0]}
+  Wait Until Page Contains Element    xpath=//*[contains(@class, 'ui-button-text ui-c')][./text()='Нова закупівля']   10
+  Click Element                       xpath=//*[contains(@class, 'ui-button-text ui-c')][./text()='Нова закупівля']
+  Wait Until Page Contains Element    id=mForm:data:name
+  Input text                          id=mForm:data:name     ${title}
+  Input text                          id=mForm:data:desc     ${description}
+  Input text                          id=mForm:data:budget   ${budget}
+  Input text                          id=mForm:data:step     ${step_rate}
+  Click Element                       xpath=//*[@id='mForm:data:vat']/tbody/tr/td[1]//span
+  Input text                          id=mForm:data:dEPr_input    ${delivery_end_date}
+  Click Element                       id=mForm:data:cKind_label
+  Click Element                       xpath=//div[@id='mForm:data:cKind_panel']//li[3]
+  Input text                          id=mForm:data:cCpvGr_input      ${cpv_id_1}
+  Wait Until Page Contains Element    xpath=.//*[@id='mForm:data:cCpvGr_panel']/table/tbody/tr/td[2]/span   10
+  Click Element                       xpath=.//*[@id='mForm:data:cCpvGr_panel']/table/tbody/tr/td[2]/span
+  Input text                          id=mForm:data:subject0    ${dkpp_desc}
+  Input text                          id=mForm:data:cCpv0_input   ${cpv_id}
+  Wait Until Page Contains Element    xpath=//div[@id='mForm:data:cCpv0_panel']//td[1]/span   10
+  Click Element                       xpath=//div[@id='mForm:data:cCpv0_panel']//td[1]/span
+  Input text                          id=mForm:data:unit0_input    ${code}
+  Wait Until Page Contains Element    xpath=//div[@id='mForm:data:unit0_panel']//tr/td[1]   10
+  Click Element                       xpath=//div[@id='mForm:data:unit0_panel']//tr/td[1]
+  Input text                          id=mForm:data:amount0   ${quantity}
+  Input text                          id=mForm:data:cDkpp0_input    ${dkpp_id}
+  Wait Until Page Contains Element    xpath=//div[@id='mForm:data:cDkpp0_panel']//tr[1]/td[2]/span   10
+  Click Element                       xpath=//div[@id='mForm:data:cDkpp0_panel']//tr[1]/td[2]/span
+  Input text                          id=mForm:data:rName    ${name}
+  Input text                          id=mForm:data:rPhone    ${telephone}
+  Input text                          id=mForm:data:rMail   ${mail}
+  Choose File                         id=mForm:data:docFile_input     ${file_path}
+  Run Keyword if   '${mode}' == 'multi'   Додати предмет   items
+  Click Element                       id=mForm:bSave
+  Sleep   5
+  ${tender_UAid}=  Get Text           id=mForm:nBid
+  ${tender_UAid}=  Get Substring  ${tender_UAid}  19
+  ${Ids}       Convert To String  ${tender_UAid}
+  Run keyword if   '${mode}' == 'multi'   Set Multi Ids   ${tender_UAid}
+  [return]  ${Ids}
+
+Set Multi Ids
+  [Arguments]  @{ARGUMENTS}
+  [Documentation]
+  ...      ${ARGUMENTS[0]} ==  ${tender_UAid}
+  ${id}=           Get Text           id=mForm:nBid
+  ${Ids}   Create List    ${tender_UAid}   ${id}
+
+Додати предмет
+  [Arguments]  @{ARGUMENTS}
+  [Documentation]
+  ...      ${ARGUMENTS[0]} ==  items
+  ${dkpp_desc1}=     Get From Dictionary   ${items[1].additionalClassifications[0]}   description
+  ${dkpp_id11}=      Get From Dictionary   ${items[1].additionalClassifications[0]}  id
+  ${dkpp_desc2}=     Get From Dictionary   ${items[2].additionalClassifications[0]}   description
+  ${dkpp_id2}=       Get From Dictionary   ${items[2].additionalClassifications[0]}  id
+  ${dkpp_desc3}=     Get From Dictionary   ${items[3].additionalClassifications[0]}   description
+  ${dkpp_id3}=       Get From Dictionary   ${items[3].additionalClassifications[0]}  id
+
+  Wait Until Page Contains Element   xpath=//button[@class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"]   10
+  Wait Until Page Contains Element   xpath=//button[contains(@class, 'ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only')]   10
+  Wait Until Page Contains Element   xpath=//button[@id="mForm:data:j_idt911"]|//button[@id="mForm:data:j_idt726"]   10
+  Click Element                      xpath=//button[@id="mForm:data:j_idt911"]|//button[@id="mForm:data:j_idt726"]
+  Wait Until Page Contains Element   id=mForm:data:subject1   10
+  Input text                         id=mForm:data:subject1    ${dkpp_desc1}
+  Input text                         id=mForm:data:cCpv1_input   ${cpv_id}
+  Wait Until Page Contains Element   xpath=//div[@id='mForm:data:cCpv1_panel']/table/tbody/tr/td[1]/span   10
+  Click Element                      xpath=//div[@id='mForm:data:cCpv1_panel']/table/tbody/tr/td[1]/span
+  Input text                         id=mForm:data:unit1_input    ${code}
+  Wait Until Page Contains Element   xpath=//div[@id='mForm:data:unit1_panel']/table/tbody/tr/td[1]   10
+  Click Element                      xpath=//div[@id='mForm:data:unit1_panel']/table/tbody/tr/td[1]
+  Input text                         id=mForm:data:amount1   ${quantity}
+  Input text                         id=mForm:data:cDkpp1_input    ${dkpp_id11}
+  Wait Until Page Contains Element   xpath=//div[@id='mForm:data:cDkpp1_panel']/table/tbody/tr/td[1]/span   10
+  Click Element                      xpath=//div[@id='mForm:data:cDkpp1_panel']/table/tbody/tr/td[1]/span
+  Click Element                      xpath=//button[@id="mForm:data:j_idt911"]|//button[@id="mForm:data:j_idt726"]
+  Wait Until Page Contains Element   id=mForm:data:subject2   10
+  Input text                         id=mForm:data:subject2    ${dkpp_desc2}
+  Input text                         id=mForm:data:cCpv2_input   ${cpv_id}
+  Wait Until Page Contains Element   xpath=//div[@id='mForm:data:cCpv2_panel']/table/tbody/tr/td[1]/span   10
+  Click Element                      xpath=//div[@id='mForm:data:cCpv2_panel']/table/tbody/tr/td[1]/span
+  Input text                         id=mForm:data:unit2_input    ${code}
+  Wait Until Page Contains Element   xpath=//div[@id='mForm:data:unit2_panel']/table/tbody/tr/td[1]   10
+  Click Element                      xpath=//div[@id='mForm:data:unit2_panel']/table/tbody/tr/td[1]
+  Input text                         id=mForm:data:amount2   ${quantity}
+  Input text                         id=mForm:data:cDkpp2_input    ${dkpp_id2}
+  Wait Until Page Contains Element   xpath=//div[@id='mForm:data:cDkpp2_panel']/table/tbody/tr/td[1]/span   10
+  Click Element                      xpath=//div[@id='mForm:data:cDkpp2_panel']/table/tbody/tr/td[1]/span
+  Click Element                      xpath=//button[@id="mForm:data:j_idt911"]|//button[@id="mForm:data:j_idt726"]
+  Wait Until Page Contains Element   id=mForm:data:subject3   10
+  Input text                         id=mForm:data:subject3    ${dkpp_desc3}
+  Input text                         id=mForm:data:cCpv3_input   ${cpv_id}
+  Wait Until Page Contains Element   xpath=//div[@id='mForm:data:cCpv3_panel']/table/tbody/tr/td[1]/span   10
+  Click Element                      xpath=//div[@id='mForm:data:cCpv3_panel']/table/tbody/tr/td[1]/span
+  Input text                         id=mForm:data:unit3_input    ${code}
+  Wait Until Page Contains Element   xpath=//div[@id='mForm:data:unit3_panel']/table/tbody/tr/td[1]   10
+  Click Element                      xpath=//div[@id='mForm:data:unit3_panel']/table/tbody/tr/td[1]
+  Input text                         id=mForm:data:amount3   ${quantity}
+  Input text                         id=mForm:data:cDkpp3_input    ${dkpp_id3}
+  Wait Until Page Contains Element   xpath=//div[@id='mForm:data:cDkpp3_panel']/table/tbody/tr/td[1]/span   10
+  Click Element                      xpath=//div[@id='mForm:data:cDkpp3_panel']/table/tbody/tr/td[1]/span
+
 Пошук тендера по ідентифікатору
   [Arguments]  @{ARGUMENTS}
--- a/op_robot_tests/tests_files/initial_data.py
View file @f3c95be
+++ b/op_robot_tests/tests_files/initial_data.py
View file @f3c95be
@@ -91,8 +91,8 @@ def test_tender_data(period_interval=2):
         }
     ],
     "enquiryPeriod": {
-        "startDate": (now + timedelta(minutes=2)).isoformat(),
-        "endDate": (now + timedelta(minutes=3)).isoformat()
+        "startDate": (now).isoformat(),
+        "endDate": (now + timedelta(minutes=1)).isoformat()
     },
     "tenderPeriod": {
         "startDate": (now + timedelta(minutes=2)).isoformat(),
@@ -366,12 +366,12 @@ def test_tender_data_multiple_lots(period_interval=2):
         }
     ],
     "enquiryPeriod": {
-        "startDate": (now + timedelta(minutes=3)).isoformat(),
-        "endDate": (now + timedelta(minutes=4)).isoformat()
+        "startDate": (now).isoformat(),
+        "endDate": (now + timedelta(minutes=1)).isoformat()
     },
     "tenderPeriod": {
-        "startDate": (now + timedelta(minutes=4)).isoformat(),
-        "endDate": (now + timedelta(minutes=(5+period_interval))).isoformat()
+        "startDate": (now + timedelta(minutes=2)).isoformat(),
+        "endDate": (now + timedelta(minutes=(2+period_interval))).isoformat()
     }
 }    
--- a/op_robot_tests/tests_files/service_keywords.py
View file @f3c95be
+++ b/op_robot_tests/tests_files/service_keywords.py
View file @f3c95be
@@ -176,3 +176,11 @@ def newtend_date_picker_index(isodate):
     if now.day>iso_dt.day:
         mod = calendar.monthrange(now.year, now.month)[1] + mod
     return mod + iso_dt.day
+
+def Add_time_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
--- a/op_robot_tests/tests_files/singleItemTender.robot
View file @f3c95be
+++ b/op_robot_tests/tests_files/singleItemTender.robot
View file @f3c95be
@@ -26,7 +26,7 @@ ${question_id}   0
 *** Test Cases ***
 Можливість оголосити однопредметний тендер
   [Tags]   ${USERS.users['${tender_owner}'].broker}: Можливість оголосити тендер
-  [Documentation]   Створення закупівлі замовником, обовязково має повертати UAID закупівлі (номер тендера),   
+  [Documentation]   Створення закупівлі замовником, обовязково має повертати UAID закупівлі (номер тендера),
   ${TENDER_UAID}=  Викликати для учасника     ${tender_owner}    Створити тендер  ${INITIAL_TENDER_DATA}
   ${LAST_MODIFICATION_DATE}=  Get Current Date
   Set To Dictionary  ${TENDER}   TENDER_UAID             ${TENDER_UAID}
@@ -38,12 +38,12 @@ ${question_id}   0
   [Documentation]   Закупівельник   ${USERS.users['${tender_owner}'].broker}  завантажує документацію  до  оголошеної закупівлі
   ${filepath}=   create_fake_doc
   ${doc_upload_reply}=  Викликати для учасника   ${tender_owner}   Завантажити документ  ${filepath}  ${TENDER['TENDER_UAID']}
-  ${file_upload_process_data} =  Create Dictionary   filepath=${filepath}  doc_upload_reply=${doc_upload_reply}      
+  ${file_upload_process_data} =  Create Dictionary   filepath=${filepath}  doc_upload_reply=${doc_upload_reply}
   log  ${file_upload_process_data}
   Set To Dictionary  ${USERS.users['${tender_owner}']}   file_upload_process_data   ${file_upload_process_data}
   Log  ${USERS.users['${tender_owner}']}
-   
-  
+
+
 Можливість подати скаргу на умови
   [Tags]   ${USERS.users['${provider}'].broker}: Можливість подати скаргу на умови
   [Documentation]    Користувач  ${USERS.users['${provider}'].broker}  намагається подати скаргу на умови оголошеної  закупівлі
@@ -226,10 +226,10 @@ ${question_id}   0
   [Tags]   ${USERS.users['${provider}'].broker}: Можливість подати цінову пропозицію
   ${bid}=  test bid data
   Log   ${bid}
-  ${bidresponces}=  Create Dictionary 
+  ${bidresponces}=  Create Dictionary
   ${bid_before_biddperiod_resp}=  Викликати для учасника   ${provider}   Подати цінову пропозицію  shouldfail  ${TENDER['TENDER_UAID']}   ${bid}
   Set To Dictionary  ${bidresponces}                 bid_before_biddperiod_resp  ${bid_before_biddperiod_resp}
-  Set To Dictionary  ${USERS.users['${provider}']}   bidresponces  ${bidresponces} 
+  Set To Dictionary  ${USERS.users['${provider}']}   bidresponces  ${bidresponces}
   log   ${USERS.users['${provider}']}
 #######
@@ -285,7 +285,7 @@ ${question_id}   0
   ${fixbidto50000resp}=  Викликати для учасника   ${provider}   Змінити цінову пропозицію   ${TENDER['TENDER_UAID']}   ${USERS.users['${provider}'].bidresponces['resp']}
   Set To Dictionary  ${USERS.users['${provider}'].bidresponces}   fixbidto50000resp   ${fixbidto50000resp}
   log  ${fixbidto50000resp}
-  
+
 Можливість змінити повторну цінову пропозицію до 10
   [Tags]   ${USERS.users['${provider}'].broker}: Можливість змінити цінову пропозицію
   Set To Dictionary  ${USERS.users['${provider}'].bidresponces['resp'].data.value}  amount   10
@@ -298,16 +298,16 @@ ${question_id}   0
   [Tags]   ${USERS.users['${provider}'].broker}: Можливість прийняти пропозицію переможця
   log   ${USERS.users['${provider}'].broker}
   ${filepath}=   create_fake_doc
-  ${bid_doc_upload}=  Викликати для учасника   ${provider}   Завантажити документ в ставку  ${filepath}   ${TENDER['TENDER_UAID']}   
+  ${bid_doc_upload}=  Викликати для учасника   ${provider}   Завантажити документ в ставку  ${filepath}   ${TENDER['TENDER_UAID']}
   Set To Dictionary  ${USERS.users['${provider}'].bidresponces}   bid_doc_upload   ${bid_doc_upload}
-  
+
 порівняти документ
   [Tags]   ${USERS.users['${provider}'].broker}: вичитати документ
   ${url}=      Get Variable Value   ${USERS.users['${provider}'].bidresponces['bid_doc_upload']['upload_responce'].data.url}
-  ${doc}  ${flnnm}=   Викликати для учасника   ${provider}  отримати документ   ${TENDER['TENDER_UAID']}  ${url}  
-  
+  ${doc}  ${flnnm}=   Викликати для учасника   ${provider}  отримати документ   ${TENDER['TENDER_UAID']}  ${url}
+
   FIXME: finish the keyword
-  
+
   Should Be Equal  ${flcntnt}   ${doc}
   Should Be Equal  ${flpth}   ${flnnm}
@@ -331,25 +331,25 @@ ${question_id}   0
   Дочекатись дати початоку прийому пропозицій
   ${bid}=  test bid data
   Log  ${bid}
-  ${bidresponces}=  Create Dictionary 
+  ${bidresponces}=  Create Dictionary
   ${resp}=  Викликати для учасника   ${provider1}   Подати цінову пропозицію   ${TENDER['TENDER_UAID']}   ${bid}
   Set To Dictionary  ${bidresponces}                 resp  ${resp}
   Set To Dictionary  ${USERS.users['${provider1}']}   bidresponces  ${bidresponces}
   log  ${resp}
   log  ${USERS.users['${provider1}'].bidresponces}
- 
+
 Неможливість побачити цінові пропозиції учасників під час прийому пропозицій
   [Tags]   ${USERS.users['${viewer}'].broker}: Можливість подати цінову пропозицію
-  
+
   FIXME: finish the keyword
-  
-  ${field_date}=  Викликати для учасника    ${viewer}   отримати інформацію із тендера    
+
+  ${field_date}=  Викликати для учасника    ${viewer}   отримати інформацію із тендера
 Завантажити документ другим учасником
   [Tags]   ${USERS.users['${provider1}'].broker}: Можливість прийняти пропозицію переможця
   log   ${USERS.users['${provider1}'].broker}
   ${filepath}=   create_fake_doc
-  ${bid_doc_upload}=  Викликати для учасника   ${provider1}   Завантажити документ в ставку  ${filepath}   ${TENDER['TENDER_UAID']}   
+  ${bid_doc_upload}=  Викликати для учасника   ${provider1}   Завантажити документ в ставку  ${filepath}   ${TENDER['TENDER_UAID']}
   Set To Dictionary  ${USERS.users['${provider1}'].bidresponces}   bid_doc_upload   ${bid_doc_upload}
 Можливість побачити скаргу користувачем під час подачі пропозицій
@@ -384,21 +384,21 @@ ${question_id}   0
 Неможливість завантажити документ другим учасником після закінчення прийому пропозицій
   [Tags]   ${USERS.users['${provider1}'].broker}: Неможливість документ першим учасником після закінчення прийому пропозицій
   ${filepath}=   create_fake_doc
-  ${bid_doc_upload_fail}=  Викликати для учасника   ${provider1}   Завантажити документ в ставку   shouldfail   ${filepath}   ${TENDER['TENDER_UAID']}   
+  ${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}: 
+  [Tags]   ${USERS.users['${provider1}'].broker}:
   ${filepath}=   create_fake_doc
   ${bidid}=  Get Variable Value  ${USERS.users['${provider1}'].bidresponces['resp'].data.id}
   ${docid}=  Get Variable Value  ${USERS.users['${provider1}'].bidresponces['bid_doc_upload']['upload_responce'].data.id}
   ${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}