Commit e487beb497712b5e6526d41f437bc41eebd2e8f4
1 parent
2f7edbff
створення_тендеру_і_багатопредметного_тендеру_etendet+netcast
Showing
2 changed files
with
1 additions
and
25 deletions
@@ -24,7 +24,7 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | @@ -24,7 +24,7 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | ||
24 | [Arguments] @{ARGUMENTS} | 24 | [Arguments] @{ARGUMENTS} |
25 | [Documentation] Відкрити брaвзер, створити обєкт api wrapper, тощо | 25 | [Documentation] Відкрити брaвзер, створити обєкт api wrapper, тощо |
26 | ... ${ARGUMENTS[0]} == username | 26 | ... ${ARGUMENTS[0]} == username |
27 | - Open Browser ${USERS.users['${ARGUMENTS[0]}'].homepage} alias=${ARGUMENTS[0]} | 27 | + Open Browser ${USERS.users['${ARGUMENTS[0]}'].homepage} ${USERS.users['${username}'].browser} alias=${ARGUMENTS[0]} |
28 | Set Window Size @{USERS.users['${ARGUMENTS[0]}'].size} | 28 | Set Window Size @{USERS.users['${ARGUMENTS[0]}'].size} |
29 | Set Window Position @{USERS.users['${ARGUMENTS[0]}'].position} | 29 | Set Window Position @{USERS.users['${ARGUMENTS[0]}'].position} |
30 | 30 |
@@ -73,21 +73,13 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | @@ -73,21 +73,13 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | ||
73 | Click Element jquery=a[href="/tenders/new"] | 73 | Click Element jquery=a[href="/tenders/new"] |
74 | Wait Until Page Contains Element name=tender_title 100 | 74 | Wait Until Page Contains Element name=tender_title 100 |
75 | Input text name=tender_title ${title} | 75 | Input text name=tender_title ${title} |
76 | - Wait Until Page Contains Element name=tender_description 100 | ||
77 | Input text name=tender_description ${description} | 76 | Input text name=tender_description ${description} |
78 | - Wait Until Page Contains Element name=tender_value_amount 100 | ||
79 | Input text name=tender_value_amount ${budget} | 77 | Input text name=tender_value_amount ${budget} |
80 | - Wait Until Page Contains Element name=tender_minimalStep_amount 100 | ||
81 | Input text name=tender_minimalStep_amount ${step_rate} | 78 | Input text name=tender_minimalStep_amount ${step_rate} |
82 | - Wait Until Page Contains Element name=items[0][item_description] 100 | ||
83 | Input text name=items[0][item_description] ${items_description} | 79 | Input text name=items[0][item_description] ${items_description} |
84 | - Wait Until Page Contains Element name=items[0][item_quantity] 100 | ||
85 | Input text name=items[0][item_quantity] ${quantity} | 80 | Input text name=items[0][item_quantity] ${quantity} |
86 | - Wait Until Page Contains Element name=items[0][item_deliveryAddress_countryName] 100 | ||
87 | Input text name=items[0][item_deliveryAddress_countryName] ${countryName} | 81 | Input text name=items[0][item_deliveryAddress_countryName] ${countryName} |
88 | - Wait Until Page Contains Element name=items[0][item_deliveryDate_endDate] 100 | ||
89 | Input text name=items[0][item_deliveryDate_endDate] ${delivery_end_date} | 82 | Input text name=items[0][item_deliveryDate_endDate] ${delivery_end_date} |
90 | - Wait Until Page Contains Element xpath=//a[contains(@data-class, 'cpv')][./text()='Визначити за довідником'] 100 | ||
91 | Click Element xpath=//a[contains(@data-class, 'cpv')][./text()='Визначити за довідником'] | 83 | Click Element xpath=//a[contains(@data-class, 'cpv')][./text()='Визначити за довідником'] |
92 | Select Frame xpath=//iframe[contains(@src,'/js/classifications/cpv/uk.htm?relation=true')] | 84 | Select Frame xpath=//iframe[contains(@src,'/js/classifications/cpv/uk.htm?relation=true')] |
93 | Input text id=search ${cpv} | 85 | Input text id=search ${cpv} |
@@ -95,7 +87,6 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | @@ -95,7 +87,6 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | ||
95 | Click Element xpath=//a[contains(@id,'${cpv_id1}')] | 87 | Click Element xpath=//a[contains(@id,'${cpv_id1}')] |
96 | Click Element xpath=.//*[@id='select'] | 88 | Click Element xpath=.//*[@id='select'] |
97 | Unselect Frame | 89 | Unselect Frame |
98 | - Wait Until Page Contains Element xpath=//a[contains(@data-class, 'dkpp')][./text()='Визначити за довідником'] 100 | ||
99 | Click Element xpath=//a[contains(@data-class, 'dkpp')][./text()='Визначити за довідником'] | 90 | Click Element xpath=//a[contains(@data-class, 'dkpp')][./text()='Визначити за довідником'] |
100 | Select Frame xpath=//iframe[contains(@src,'/js/classifications/dkpp/uk.htm?relation=true')] | 91 | Select Frame xpath=//iframe[contains(@src,'/js/classifications/dkpp/uk.htm?relation=true')] |
101 | Input text id=search ${dkpp_desc} | 92 | Input text id=search ${dkpp_desc} |
@@ -103,9 +94,7 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | @@ -103,9 +94,7 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | ||
103 | Click Element xpath=//a[contains(@id,'${dkpp_id1}')] | 94 | Click Element xpath=//a[contains(@id,'${dkpp_id1}')] |
104 | Click Element xpath=.//*[@id='select'] | 95 | Click Element xpath=.//*[@id='select'] |
105 | Unselect Frame | 96 | Unselect Frame |
106 | - Wait Until Page Contains Element name=tender_enquiryPeriod_endDate 100 | ||
107 | Input text name=tender_enquiryPeriod_endDate ${enquiry_end_date} | 97 | Input text name=tender_enquiryPeriod_endDate ${enquiry_end_date} |
108 | - Wait Until Page Contains Element name=tender_tenderPeriod_endDate 100 | ||
109 | Input text name=tender_tenderPeriod_endDate ${end_date} | 98 | Input text name=tender_tenderPeriod_endDate ${end_date} |
110 | Run Keyword if '${mode}' == 'multi' Додати предмет items | 99 | Run Keyword if '${mode}' == 'multi' Додати предмет items |
111 | Wait Until Page Contains Element name=do 100 | 100 | Wait Until Page Contains Element name=do 100 |
@@ -136,9 +125,7 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | @@ -136,9 +125,7 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | ||
136 | Click Element xpath=//a[contains(@class, 'addMultiItem')][./text()='Додати предмет закупівлі'] | 125 | Click Element xpath=//a[contains(@class, 'addMultiItem')][./text()='Додати предмет закупівлі'] |
137 | Wait Until Page Contains Element name=items[1][item_description] 100 | 126 | Wait Until Page Contains Element name=items[1][item_description] 100 |
138 | Input text name=items[1][item_description] ${description} | 127 | Input text name=items[1][item_description] ${description} |
139 | - Wait Until Page Contains Element name=items[1][item_quantity] 100 | ||
140 | Input text name=items[1][item_quantity] ${quantity} | 128 | Input text name=items[1][item_quantity] ${quantity} |
141 | - Wait Until Page Contains Element xpath=(//a[contains(@data-class, 'cpv')][./text()='Визначити за довідником'])[2] 100 | ||
142 | Click Element xpath=(//a[contains(@data-class, 'cpv')][./text()='Визначити за довідником'])[2] | 129 | Click Element xpath=(//a[contains(@data-class, 'cpv')][./text()='Визначити за довідником'])[2] |
143 | Select Frame xpath=//iframe[contains(@src,'/js/classifications/cpv/uk.htm?relation=true')] | 130 | Select Frame xpath=//iframe[contains(@src,'/js/classifications/cpv/uk.htm?relation=true')] |
144 | Input text id=search ${cpv} | 131 | Input text id=search ${cpv} |
@@ -146,7 +133,6 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | @@ -146,7 +133,6 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | ||
146 | Click Element xpath=//a[contains(@id,'${cpv_id1}')] | 133 | Click Element xpath=//a[contains(@id,'${cpv_id1}')] |
147 | Click Element xpath=.//*[@id='select'] | 134 | Click Element xpath=.//*[@id='select'] |
148 | Unselect Frame | 135 | Unselect Frame |
149 | - Wait Until Page Contains Element xpath=(//a[contains(@data-class, 'dkpp')][./text()='Визначити за довідником'])[2] 100 | ||
150 | Click Element xpath=(//a[contains(@data-class, 'dkpp')][./text()='Визначити за довідником'])[2] | 136 | Click Element xpath=(//a[contains(@data-class, 'dkpp')][./text()='Визначити за довідником'])[2] |
151 | Select Frame xpath=//iframe[contains(@src,'/js/classifications/dkpp/uk.htm?relation=true')] | 137 | Select Frame xpath=//iframe[contains(@src,'/js/classifications/dkpp/uk.htm?relation=true')] |
152 | Input text id=search ${dkpp_desc1} | 138 | Input text id=search ${dkpp_desc1} |
@@ -154,13 +140,10 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | @@ -154,13 +140,10 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | ||
154 | Click Element xpath=//a[contains(@id,'${dkpp_1id}')] | 140 | Click Element xpath=//a[contains(@id,'${dkpp_1id}')] |
155 | Click Element xpath=.//*[@id='select'] | 141 | Click Element xpath=.//*[@id='select'] |
156 | Unselect Frame | 142 | Unselect Frame |
157 | - Wait Until Page Contains Element xpath=//a[contains(@class, 'addMultiItem')][./text()='Додати предмет закупівлі'] | ||
158 | Click Element xpath=//a[contains(@class, 'addMultiItem')][./text()='Додати предмет закупівлі'] | 143 | Click Element xpath=//a[contains(@class, 'addMultiItem')][./text()='Додати предмет закупівлі'] |
159 | Wait Until Page Contains Element name=items[2][item_description] 100 | 144 | Wait Until Page Contains Element name=items[2][item_description] 100 |
160 | Input text name=items[2][item_description] ${description} | 145 | Input text name=items[2][item_description] ${description} |
161 | - Wait Until Page Contains Element name=items[2][item_quantity] 100 | ||
162 | Input text name=items[2][item_quantity] ${quantity} | 146 | Input text name=items[2][item_quantity] ${quantity} |
163 | - Wait Until Page Contains Element xpath=(//a[contains(@data-class, 'cpv')][./text()='Визначити за довідником'])[3] 100 | ||
164 | Click Element xpath=(//a[contains(@data-class, 'cpv')][./text()='Визначити за довідником'])[3] | 147 | Click Element xpath=(//a[contains(@data-class, 'cpv')][./text()='Визначити за довідником'])[3] |
165 | Select Frame xpath=//iframe[contains(@src,'/js/classifications/cpv/uk.htm?relation=true')] | 148 | Select Frame xpath=//iframe[contains(@src,'/js/classifications/cpv/uk.htm?relation=true')] |
166 | Input text id=search ${cpv} | 149 | Input text id=search ${cpv} |
@@ -168,7 +151,6 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | @@ -168,7 +151,6 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | ||
168 | Click Element xpath=//a[contains(@id,'${cpv_id1}')] | 151 | Click Element xpath=//a[contains(@id,'${cpv_id1}')] |
169 | Click Element xpath=.//*[@id='select'] | 152 | Click Element xpath=.//*[@id='select'] |
170 | Unselect Frame | 153 | Unselect Frame |
171 | - Wait Until Page Contains Element xpath=(//a[contains(@data-class, 'dkpp')][./text()='Визначити за довідником'])[3] 100 | ||
172 | Click Element xpath=(//a[contains(@data-class, 'dkpp')][./text()='Визначити за довідником'])[3] | 154 | Click Element xpath=(//a[contains(@data-class, 'dkpp')][./text()='Визначити за довідником'])[3] |
173 | Select Frame xpath=//iframe[contains(@src,'/js/classifications/dkpp/uk.htm?relation=true')] | 155 | Select Frame xpath=//iframe[contains(@src,'/js/classifications/dkpp/uk.htm?relation=true')] |
174 | Input text id=search ${dkpp_desc2} | 156 | Input text id=search ${dkpp_desc2} |
@@ -176,13 +158,10 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | @@ -176,13 +158,10 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | ||
176 | Click Element xpath=//a[contains(@id,'${dkpp_id2_1}')] | 158 | Click Element xpath=//a[contains(@id,'${dkpp_id2_1}')] |
177 | Click Element xpath=.//*[@id='select'] | 159 | Click Element xpath=.//*[@id='select'] |
178 | Unselect Frame | 160 | Unselect Frame |
179 | - Wait Until Page Contains Element xpath=//a[contains(@class, 'addMultiItem')][./text()='Додати предмет закупівлі'] | ||
180 | Click Element xpath=//a[contains(@class, 'addMultiItem')][./text()='Додати предмет закупівлі'] | 161 | Click Element xpath=//a[contains(@class, 'addMultiItem')][./text()='Додати предмет закупівлі'] |
181 | Wait Until Page Contains Element name=items[3][item_description] 100 | 162 | Wait Until Page Contains Element name=items[3][item_description] 100 |
182 | Input text name=items[3][item_description] ${description} | 163 | Input text name=items[3][item_description] ${description} |
183 | - Wait Until Page Contains Element name=items[3][item_quantity] 100 | ||
184 | Input text name=items[3][item_quantity] ${quantity} | 164 | Input text name=items[3][item_quantity] ${quantity} |
185 | - Wait Until Page Contains Element xpath=(//a[contains(@data-class, 'cpv')][./text()='Визначити за довідником'])[4] 100 | ||
186 | Click Element xpath=(//a[contains(@data-class, 'cpv')][./text()='Визначити за довідником'])[4] | 165 | Click Element xpath=(//a[contains(@data-class, 'cpv')][./text()='Визначити за довідником'])[4] |
187 | Select Frame xpath=//iframe[contains(@src,'/js/classifications/cpv/uk.htm?relation=true')] | 166 | Select Frame xpath=//iframe[contains(@src,'/js/classifications/cpv/uk.htm?relation=true')] |
188 | Input text id=search ${cpv} | 167 | Input text id=search ${cpv} |
@@ -190,7 +169,6 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | @@ -190,7 +169,6 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | ||
190 | Click Element xpath=//a[contains(@id,'${cpv_id1}')] | 169 | Click Element xpath=//a[contains(@id,'${cpv_id1}')] |
191 | Click Element xpath=.//*[@id='select'] | 170 | Click Element xpath=.//*[@id='select'] |
192 | Unselect Frame | 171 | Unselect Frame |
193 | - Wait Until Page Contains Element xpath=(//a[contains(@data-class, 'dkpp')][./text()='Визначити за довідником'])[4] 100 | ||
194 | Click Element xpath=(//a[contains(@data-class, 'dkpp')][./text()='Визначити за довідником'])[4] | 172 | Click Element xpath=(//a[contains(@data-class, 'dkpp')][./text()='Визначити за довідником'])[4] |
195 | Select Frame xpath=//iframe[contains(@src,'/js/classifications/dkpp/uk.htm?relation=true')] | 173 | Select Frame xpath=//iframe[contains(@src,'/js/classifications/dkpp/uk.htm?relation=true')] |
196 | Input text id=search ${dkpp_desc3} | 174 | Input text id=search ${dkpp_desc3} |
@@ -198,9 +176,7 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | @@ -198,9 +176,7 @@ ${locator.enquiryPeriod.endDate} jquery=tender-procedure-info>div.row:contai | ||
198 | Click Element xpath=//a[contains(@id,'${dkpp_id3_1}')] | 176 | Click Element xpath=//a[contains(@id,'${dkpp_id3_1}')] |
199 | Click Element xpath=.//*[@id='select'] | 177 | Click Element xpath=.//*[@id='select'] |
200 | Unselect Frame | 178 | Unselect Frame |
201 | - Wait Until Page Contains Element name=tender_enquiryPeriod_endDate 100 | ||
202 | Input text name=tender_enquiryPeriod_endDate ${enquiry_end_date} | 179 | Input text name=tender_enquiryPeriod_endDate ${enquiry_end_date} |
203 | - Wait Until Page Contains Element name=tender_tenderPeriod_endDate 100 | ||
204 | Input text name=tender_tenderPeriod_endDate ${end_date} | 180 | Input text name=tender_tenderPeriod_endDate ${end_date} |
205 | 181 | ||
206 | 182 |
Please
register
or
login
to post a comment