Alex / prozorro-robot_tests · Commits

Commit f43f5fd49c8427fd58b7f800ba987d451331196f

Authored by yboi
1 parent 246df473

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

Inline Side-by-side
Showing 2 changed files with 35 additions and 96 deletions
... ... @@ -62,6 +62,7 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai
62 62 ${cpv_id1}= String.Replace String ${cpv_id} - _
63 63 ${dkpp_desc}= Get From Dictionary ${items[0].additionalClassifications[0]} description
64 64 ${dkpp_id}= Get From Dictionary ${items[0].additionalClassifications[0]} id
  65 + ${dkpp_id1}= String.Replace String ${dkpp_id} - _
65 66 ${enquiry_end_date}= Get From Dictionary ${ARGUMENTS[1].data.enquiryPeriod} endDate
66 67 ${enquiry_end_date}= convert_date_to_slash_format ${enquiry_end_date}
67 68 ${end_date}= Get From Dictionary ${ARGUMENTS[1].data.tenderPeriod} endDate
... ... @@ -99,115 +100,38 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai
99 100 Select Frame xpath=//iframe[contains(@src,'/js/classifications/dkpp/uk.htm?relation=true')]
100 101 Input text id=search ${dkpp_desc}
101 102 Wait Until Page Contains ${dkpp_id}
102   - Click Element xpath=//a[contains(@id,'${dkpp_id}')]
  103 + Click Element xpath=//a[contains(@id,'${dkpp_id1}')]
103 104 Click Element xpath=.//*[@id='select']
104 105 Unselect Frame
105 106 Wait Until Page Contains Element name=tender_enquiryPeriod_endDate 100
106 107 Input text name=tender_enquiryPeriod_endDate ${enquiry_end_date}
107 108 Wait Until Page Contains Element name=tender_tenderPeriod_endDate 100
108 109 Input text name=tender_tenderPeriod_endDate ${end_date}
  110 + Run Keyword if '${mode}' == 'multi' Додати предмет items
109 111 Wait Until Page Contains Element name=do 100
110 112 Click Element name=do
111 113 Wait Until Page Contains Element xpath=//a[contains(@class, 'button pubBtn')] 100
112 114 Click Element xpath=//a[contains(@class, 'button pubBtn')]
113 115 Wait Until Page Contains Тендер опубліковано 100
114 116 ${tender_UAid}= Get Text xpath=//*/section[6]/table/tbody/tr[2]/td[2]
115   - ${Ids} Create List ${tender_UAid}
  117 + ${id}= Get Text xpath=//*/section[6]/table/tbody/tr[1]/td[2]
  118 + ${Ids} Create List ${tender_UAid} ${id}
116 119 [return] ${Ids}
117 120
118   -Пошук тендера по ідентифікатору
119   - [Arguments] @{ARGUMENTS}
120   - [Documentation]
121   - ... ${ARGUMENTS[0]} == username
122   - ... ${ARGUMENTS[1]} == tenderId
123   - ... ${ARGUMENTS[2]} == id
124   - Switch browser ${ARGUMENTS[0]}
125   - ${current_location}= Get Location
126   - Run keyword if '${BROKERS['${USERS.users['${username}'].broker}'].url}/#/tenderDetailes/${ARGUMENTS[2]}'=='${current_location}' Reload Page
127   - Go to ${BROKERS['${USERS.users['${username}'].broker}'].url}
128   - Wait Until Page Contains E-TENDER - центр електронної торгівлі 10
129   - sleep 1
130   - Input Text jquery=input[ng-change='search()'] ${ARGUMENTS[1]}
131   - Click Link jquery=a[ng-click='search()']
132   - sleep 2
133   - ${last_note_id}= Add pointy note jquery=a[href^="#/tenderDetailes"] Found tender with tenderID "${ARGUMENTS[1]}" width=200 position=bottom
134   - sleep 1
135   - Remove element ${last_note_id}
136   - Click Link jquery=a[href^="#/tenderDetailes"]
137   - Wait Until Page Contains ${ARGUMENTS[1]} 10
138   - sleep 1
139   - Capture Page Screenshot
140   -
141   -Багатопредметний тендер
  121 +Додати предмет
142 122 [Arguments] @{ARGUMENTS}
143 123 [Documentation]
144   - ... ${ARGUMENTS[0]} == username
145   - ... ${ARGUMENTS[1]} == tender_data
146   - ${items}= Get From Dictionary ${ARGUMENTS[1].data} items
147   - ${title}= Get From Dictionary ${ARGUMENTS[1].data} title
148   - ${description}= Get From Dictionary ${ARGUMENTS[1].data} description
149   - ${budget}= Get From Dictionary ${ARGUMENTS[1].data.value} amount
150   - ${step_rate}= Get From Dictionary ${ARGUMENTS[1].data.minimalStep} amount
151   - ${items_description}= Get From Dictionary ${ARGUMENTS[1].data} description
152   - ${quantity}= Get From Dictionary ${items[0]} quantity
153   - ${countryName}= Get From Dictionary ${ARGUMENTS[1].data.procuringEntity.address} countryName
154   - ${delivery_end_date}= Get From Dictionary ${items[0].deliveryDate} endDate
155   - ${delivery_end_date}= convert_date_to_slash_format ${delivery_end_date}
156   - ${cpv}= Get From Dictionary ${items[0].classification} description_ua
157   - ${cpv_id}= Get From Dictionary ${items[0].classification} id
158   - ${cpv_id1}= String.Replace String ${cpv_id} - _
159   - ${dkpp_desc}= Get From Dictionary ${items[0].additionalClassifications[0]} description
  124 + ... ${ARGUMENTS[0]} == items
160 125 ${dkpp_desc1}= Get From Dictionary ${items[1].additionalClassifications[0]} description
161 126 ${dkpp_id11}= Get From Dictionary ${items[1].additionalClassifications[0]} id
162   - ${dkpp_1id}= String.Replace String ${dkpp_id11} - _
  127 + ${dkpp_1id}= Replace String ${dkpp_id11} - _
163 128 ${dkpp_desc2}= Get From Dictionary ${items[2].additionalClassifications[0]} description
164 129 ${dkpp_id2}= Get From Dictionary ${items[2].additionalClassifications[0]} id
165   - ${dkpp_id2_1}= String.Replace String ${dkpp_id2} - _
  130 + ${dkpp_id2_1}= Replace String ${dkpp_id2} - _
166 131 ${dkpp_desc3}= Get From Dictionary ${items[3].additionalClassifications[0]} description
167 132 ${dkpp_id3}= Get From Dictionary ${items[3].additionalClassifications[0]} id
168   - ${dkpp_id3_1}= String.Replace String ${dkpp_id3} - _
169   - ${dkpp_id}= Get From Dictionary ${items[0].additionalClassifications[0]} id
170   - ${dkpp_id1}= String.Replace String ${dkpp_id} - _
171   - ${enquiry_end_date}= Get From Dictionary ${ARGUMENTS[1].data.enquiryPeriod} endDate
172   - ${enquiry_end_date}= convert_date_to_slash_format ${enquiry_end_date}
173   - ${end_date}= Get From Dictionary ${ARGUMENTS[1].data.tenderPeriod} endDate
174   - ${end_date}= convert_date_to_slash_format ${end_date}
  133 + ${dkpp_id3_1}= Replace String ${dkpp_id3} - _
175 134
176   - Selenium2Library.Switch Browser ${ARGUMENTS[0]}
177   - Wait Until Page Contains Element jquery=a[href="/tenders/new"] 100
178   - Click Element jquery=a[href="/tenders/new"]
179   - Wait Until Page Contains Element name=tender_title 100
180   - Input text name=tender_title ${title}
181   - Wait Until Page Contains Element name=tender_description 100
182   - Input text name=tender_description ${description}
183   - Wait Until Page Contains Element name=tender_value_amount 100
184   - Input text name=tender_value_amount ${budget}
185   - Wait Until Page Contains Element name=tender_minimalStep_amount 100
186   - Input text name=tender_minimalStep_amount ${step_rate}
187   - Wait Until Page Contains Element name=items[0][item_description] 100
188   - Input text name=items[0][item_description] ${items_description}
189   - Wait Until Page Contains Element name=items[0][item_quantity] 100
190   - Input text name=items[0][item_quantity] ${quantity}
191   - Wait Until Page Contains Element name=items[0][item_deliveryAddress_countryName] 100
192   - Input text name=items[0][item_deliveryAddress_countryName] ${countryName}
193   - Wait Until Page Contains Element name=items[0][item_deliveryDate_endDate] 100
194   - Input text name=items[0][item_deliveryDate_endDate] ${delivery_end_date}
195   - Wait Until Page Contains Element xpath=//a[contains(@data-class, 'cpv')][./text()='Визначити за довідником'] 100
196   - Click Element xpath=//a[contains(@data-class, 'cpv')][./text()='Визначити за довідником']
197   - Select Frame xpath=//iframe[contains(@src,'/js/classifications/cpv/uk.htm?relation=true')]
198   - Input text id=search ${cpv}
199   - Wait Until Page Contains ${cpv_id}
200   - Click Element xpath=//a[contains(@id,'${cpv_id1}')]
201   - Click Element xpath=.//*[@id='select']
202   - Unselect Frame
203   - Wait Until Page Contains Element xpath=//a[contains(@data-class, 'dkpp')][./text()='Визначити за довідником'] 100
204   - Click Element xpath=//a[contains(@data-class, 'dkpp')][./text()='Визначити за довідником']
205   - Select Frame xpath=//iframe[contains(@src,'/js/classifications/dkpp/uk.htm?relation=true')]
206   - Input text id=search ${dkpp_desc}
207   - Wait Until Page Contains ${dkpp_id}
208   - Click Element xpath=//a[contains(@id,'${dkpp_id1}')]
209   - Click Element xpath=.//*[@id='select']
210   - Unselect Frame
211 135 Wait Until Page Contains Element xpath=//a[contains(@class, 'addMultiItem')][./text()='Додати предмет закупівлі']
212 136 Click Element xpath=//a[contains(@class, 'addMultiItem')][./text()='Додати предмет закупівлі']
213 137 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
278 202 Input text name=tender_enquiryPeriod_endDate ${enquiry_end_date}
279 203 Wait Until Page Contains Element name=tender_tenderPeriod_endDate 100
280 204 Input text name=tender_tenderPeriod_endDate ${end_date}
281   - Wait Until Page Contains Element name=do 100
282   - Click Element name=do
283   - Wait Until Page Contains Element xpath=//a[contains(@class, 'button pubBtn')] 100
284   - Click Element xpath=//a[contains(@class, 'button pubBtn')]
285   - Wait Until Page Contains Тендер опубліковано 100
286   - ${tender_UAid}= Get Text xpath=//*/section[6]/table/tbody/tr[2]/td[2]
287   - ${id}= Get Text xpath=//*/section[6]/table/tbody/tr[1]/td[2]
288   - ${Ids} Create List ${tender_UAid} ${id}
289   - [return] ${Ids}
  205 +
  206 +
  207 +Пошук тендера по ідентифікатору
  208 + [Arguments] @{ARGUMENTS}
  209 + [Documentation]
  210 + ... ${ARGUMENTS[0]} == username
  211 + ... ${ARGUMENTS[1]} == tenderId
  212 + ... ${ARGUMENTS[2]} == id
  213 + Switch browser ${ARGUMENTS[0]}
  214 + ${current_location}= Get Location
  215 + Run keyword if '${BROKERS['${USERS.users['${username}'].broker}'].url}/#/tenderDetailes/${ARGUMENTS[2]}'=='${current_location}' Reload Page
  216 + Go to ${BROKERS['${USERS.users['${username}'].broker}'].url}
  217 + Wait Until Page Contains E-TENDER - центр електронної торгівлі 10
  218 + sleep 1
  219 + Input Text jquery=input[ng-change='search()'] ${ARGUMENTS[1]}
  220 + Click Link jquery=a[ng-click='search()']
  221 + sleep 2
  222 + ${last_note_id}= Add pointy note jquery=a[href^="#/tenderDetailes"] Found tender with tenderID "${ARGUMENTS[1]}" width=200 position=bottom
  223 + sleep 1
  224 + Remove element ${last_note_id}
  225 + Click Link jquery=a[href^="#/tenderDetailes"]
  226 + Wait Until Page Contains ${ARGUMENTS[1]} 10
  227 + sleep 1
  228 + Capture Page Screenshot
\ No newline at end of file
... ...
... ... @@ -25,7 +25,7 @@ ${LOAD_USERS} ["${tender_owner}", "${provider}", "${viewer}"]
25 25
26 26 Можливість оголосити багатопредметний тендер
27 27 [Tags] ${USERS.users['${tender_owner}'].broker}: Можливість оголосити тендер
28   - ${ids}= Викликати для учасника ${tender_owner} Багатопредметний тендер ${INITIAL_TENDER_DATA}
  28 + ${ids}= Викликати для учасника ${tender_owner} Створити тендер ${INITIAL_TENDER_DATA}
29 29 ${TENDER_ID}= Get From List ${ids} 0
30 30 ${INTERNAL_TENDER_ID}= Get From List ${ids} 1
31 31 Set Global Variable ${INTERNAL_TENDER_ID}
... ...
Please register or login to post a comment