створення_тендеру_і_багатопредметного_тендеру_etendet+netcast

yboi
1 parent 246df473
Showing 2 changed files with 35 additions and 96 deletions
op_robot_tests/tests_files/brokers/netcast.robot
op_robot_tests/tests_files/multiItemTender.robot
--- a/op_robot_tests/tests_files/brokers/netcast.robot
View file @f43f5fd
+++ b/op_robot_tests/tests_files/brokers/netcast.robot
View file @f43f5fd
@@ -62,6 +62,7 @@ ${locator.enquiryPeriod.endDate}     jquery=tender-procedure-info>div.row:contai
   ${cpv_id1}=       String.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}=       String.Replace String   ${dkpp_id}   -   _
   ${enquiry_end_date}=   Get From Dictionary         ${ARGUMENTS[1].data.enquiryPeriod}   endDate
   ${enquiry_end_date}=   convert_date_to_slash_format   ${enquiry_end_date}
   ${end_date}=      Get From Dictionary   ${ARGUMENTS[1].data.tenderPeriod}   endDate
@@ -99,115 +100,38 @@ ${locator.enquiryPeriod.endDate}     jquery=tender-procedure-info>div.row:contai
   Select Frame                        xpath=//iframe[contains(@src,'/js/classifications/dkpp/uk.htm?relation=true')]
   Input text                          id=search     ${dkpp_desc}
   Wait Until Page Contains            ${dkpp_id}
-  Click Element                       xpath=//a[contains(@id,'${dkpp_id}')]
+  Click Element                       xpath=//a[contains(@id,'${dkpp_id1}')]
   Click Element                       xpath=.//*[@id='select']
   Unselect Frame
   Wait Until Page Contains Element    name=tender_enquiryPeriod_endDate    100
   Input text                          name=tender_enquiryPeriod_endDate   ${enquiry_end_date}
   Wait Until Page Contains Element    name=tender_tenderPeriod_endDate    100
   Input text                          name=tender_tenderPeriod_endDate    ${end_date}
+  Run Keyword if   '${mode}' == 'multi'   Додати предмет   items
   Wait Until Page Contains Element    name=do    100
   Click Element                       name=do
   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]
-  ${Ids}   Create List    ${tender_UAid}
+  ${id}=           Get Text           xpath=//*/section[6]/table/tbody/tr[1]/td[2]
+  ${Ids}   Create List    ${tender_UAid}   ${id}
   [return]  ${Ids}
-Пошук тендера по ідентифікатору
-  [Arguments]  @{ARGUMENTS}
-  [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   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    ${ARGUMENTS[1]}   10
-  sleep  1
-  Capture Page Screenshot
-
-Багатопредметний тендер
+Додати предмет
   [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
-  ${quantity}=      Get From Dictionary   ${items[0]}         quantity
-  ${countryName}=   Get From Dictionary   ${ARGUMENTS[1].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_id}=           Get From Dictionary   ${items[0].classification}         id
-  ${cpv_id1}=   String.Replace String   ${cpv_id}   -   _
-  ${dkpp_desc}=     Get From Dictionary   ${items[0].additionalClassifications[0]}   description
+  ...      ${ARGUMENTS[0]} ==  items
   ${dkpp_desc1}=     Get From Dictionary   ${items[1].additionalClassifications[0]}   description
   ${dkpp_id11}=      Get From Dictionary   ${items[1].additionalClassifications[0]}  id
-  ${dkpp_1id}=   String.Replace String   ${dkpp_id11}   -   _
+  ${dkpp_1id}=            Replace String   ${dkpp_id11}   -   _
   ${dkpp_desc2}=     Get From Dictionary   ${items[2].additionalClassifications[0]}   description
   ${dkpp_id2}=       Get From Dictionary   ${items[2].additionalClassifications[0]}  id
-  ${dkpp_id2_1}=   String.Replace String   ${dkpp_id2}   -   _
+  ${dkpp_id2_1}=          Replace String   ${dkpp_id2}   -   _
   ${dkpp_desc3}=     Get From Dictionary   ${items[3].additionalClassifications[0]}   description
   ${dkpp_id3}=       Get From Dictionary   ${items[3].additionalClassifications[0]}  id
-  ${dkpp_id3_1}=   String.Replace String   ${dkpp_id3}   -   _
-  ${dkpp_id}=       Get From Dictionary   ${items[0].additionalClassifications[0]}  id
-  ${dkpp_id1}=   String.Replace String   ${dkpp_id}   -   _
-  ${enquiry_end_date}=   Get From Dictionary         ${ARGUMENTS[1].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}=      convert_date_to_slash_format   ${end_date}
+  ${dkpp_id3_1}=          Replace String   ${dkpp_id3}   -   _
-  Selenium2Library.Switch Browser    ${ARGUMENTS[0]}
-  Wait Until Page Contains Element    jquery=a[href="/tenders/new"]   100
-  Click Element                       jquery=a[href="/tenders/new"]
-  Wait Until Page Contains Element    name=tender_title   100
-  Input text                          name=tender_title    ${title}
-  Wait Until Page Contains Element    name=tender_description   100
-  Input text                          name=tender_description    ${description}
-  Wait Until Page Contains Element    name=tender_value_amount   100
-  Input text                          name=tender_value_amount   ${budget}
-  Wait Until Page Contains Element    name=tender_minimalStep_amount   100
-  Input text                          name=tender_minimalStep_amount   ${step_rate}
-  Wait Until Page Contains Element    name=items[0][item_description]   100
-  Input text                          name=items[0][item_description]    ${items_description}
-  Wait Until Page Contains Element    name=items[0][item_quantity]   100
-  Input text                          name=items[0][item_quantity]   ${quantity}
-  Wait Until Page Contains Element    name=items[0][item_deliveryAddress_countryName]   100
-  Input text                          name=items[0][item_deliveryAddress_countryName]   ${countryName}
-  Wait Until Page Contains Element    name=items[0][item_deliveryDate_endDate]   100
-  Input text                          name=items[0][item_deliveryDate_endDate]       ${delivery_end_date}
-  Wait Until Page Contains Element    xpath=//a[contains(@data-class, 'cpv')][./text()='Визначити за довідником']   100
-  Click Element                       xpath=//a[contains(@data-class, 'cpv')][./text()='Визначити за довідником']
-  Select Frame                        xpath=//iframe[contains(@src,'/js/classifications/cpv/uk.htm?relation=true')]
-  Input text                          id=search     ${cpv}
-  Wait Until Page Contains            ${cpv_id}
-  Click Element                       xpath=//a[contains(@id,'${cpv_id1}')]
-  Click Element                       xpath=.//*[@id='select']
-  Unselect Frame
-  Wait Until Page Contains Element    xpath=//a[contains(@data-class, 'dkpp')][./text()='Визначити за довідником']   100
-  Click Element                       xpath=//a[contains(@data-class, 'dkpp')][./text()='Визначити за довідником']
-  Select Frame                        xpath=//iframe[contains(@src,'/js/classifications/dkpp/uk.htm?relation=true')]
-  Input text                          id=search     ${dkpp_desc}
-  Wait Until Page Contains            ${dkpp_id}
-  Click Element                       xpath=//a[contains(@id,'${dkpp_id1}')]
-  Click Element                       xpath=.//*[@id='select']
-  Unselect Frame
   Wait Until Page Contains Element    xpath=//a[contains(@class, 'addMultiItem')][./text()='Додати предмет закупівлі']
   Click Element                       xpath=//a[contains(@class, 'addMultiItem')][./text()='Додати предмет закупівлі']
   Wait Until Page Contains Element    name=items[1][item_description]   100
@@ -278,12 +202,27 @@ ${locator.enquiryPeriod.endDate}     jquery=tender-procedure-info>div.row:contai
   Input text                          name=tender_enquiryPeriod_endDate   ${enquiry_end_date}
   Wait Until Page Contains Element    name=tender_tenderPeriod_endDate    100
   Input text                          name=tender_tenderPeriod_endDate    ${end_date}
-  Wait Until Page Contains Element    name=do    100
-  Click Element                       name=do
-  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}
-  [return]  ${Ids}
+
+
+Пошук тендера по ідентифікатору
+  [Arguments]  @{ARGUMENTS}
+  [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   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    ${ARGUMENTS[1]}   10
+  sleep  1
+  Capture Page Screenshot
--- a/op_robot_tests/tests_files/multiItemTender.robot
View file @f43f5fd
+++ b/op_robot_tests/tests_files/multiItemTender.robot
View file @f43f5fd
@@ -25,7 +25,7 @@ ${LOAD_USERS}      ["${tender_owner}", "${provider}", "${viewer}"]
 Можливість оголосити багатопредметний тендер
   [Tags]   ${USERS.users['${tender_owner}'].broker}: Можливість оголосити тендер
-  ${ids}=  Викликати для учасника     ${tender_owner}   Багатопредметний тендер   ${INITIAL_TENDER_DATA}
+  ${ids}=  Викликати для учасника     ${tender_owner}   Створити тендер   ${INITIAL_TENDER_DATA}
   ${TENDER_ID}=   Get From List   ${ids}  0
   ${INTERNAL_TENDER_ID}=  Get From List   ${ids}  1
   Set Global Variable    ${INTERNAL_TENDER_ID}