Administrator / playtender-robot_tests · Commits

Commit 22593570d41a51368d1dc854413ba6728be1359c

Authored by Playtenders
1 parent db621957
build: skipped

variables = and fix features prepare

Inline Side-by-side
Showing 2 changed files with 50 additions and 49 deletions
... ... @@ -232,8 +232,9 @@ def prepare_tender_data(data):
232 232 i = i - 1
233 233 i = i + 1
234 234
235   - if len(data['features']) == 0:
236   - del data['features']
  235 + if 'features' in data:
  236 + if len(data['features']) == 0:
  237 + del data['features']
237 238
238 239 # moves items to its related lots
239 240 i = 0
... ...
... ... @@ -113,8 +113,8 @@ ${tender_tender_period_start_date_input_locator} = jquery=[id$=
113 113 ${tender_tender_period_end_date_input_locator} = jquery=[id$="form-tender_period_end_date"]
114 114 ${tender_tender_quick_mode_locator} = jquery=[id$="form-quick_mode"]
115 115 #esco
116   -${tender_form_general_funding_kind_input_locator} id=tenderescoform-funding_kind
117   -${tender_form_general_nbu_discount_rate_input_locator} id=tenderescoform-nbu_discount_rate
  116 +${tender_form_general_funding_kind_input_locator} = id=tenderescoform-funding_kind
  117 +${tender_form_general_nbu_discount_rate_input_locator} = id=tenderescoform-nbu_discount_rate
118 118 #closeframework
119 119 ${tender_form_general_max_awards_count_input_locator} = jquery=[id$="form-max_awards_count"]
120 120 ${tender_form_general_agreement_duration_years_input_locator} = jquery=[id$="form-agreement_duration_years"]
... ... @@ -184,9 +184,9 @@ ${tender_uaid_text_locator} = jquery=#tend
184 184 ${tender_edit_btn_locator} = jquery=#aside-part-pjax a[href*='tender/update']
185 185
186 186 #елемент проверки загрузки формы в попапе
187   -${popup_dynamic_form_loading_element_locator} jquery=.fancybox-is-open .btn-add .fa-spin
  187 +${popup_dynamic_form_loading_element_locator} = jquery=.fancybox-is-open .btn-add .fa-spin
188 188 #${add_file_to_form} xpath=//input[@type='file']
189   -${add_file_to_form_locator} jquery=.fancybox-is-open input[type$='file']
  189 +${add_file_to_form_locator} = jquery=.fancybox-is-open input[type$='file']
190 190
191 191 # tender index + search
192 192 ${tender_search_form_locator} = id=tender-filter-form
... ... @@ -194,55 +194,55 @@ ${tender_search_form_query_input_locator} = jquery=#tend
194 194 ${tender_search_form_result_locator_tpl} = jquery=#tender-list .lots__item .lot__characteristic li:contains(%query%)
195 195
196 196 #question
197   -${question_form_open_btn_locator} jquery=#aside-part-pjax a[href*="/tender/questions"]
198   -${question_open_form_answer_btn_locator_tpl} jquery=#tender-question-list .js-item div[data-title*="%title%"]
199   -${question_form_open_form_answer_btn_locator_tpl} jquery=#tender-question-list .js-item div[data-title*="%title%"] .btn.btn-default
200   -${question_form_open_form_answer_input_locator} jquery=.fancybox-is-open .fancybox-content #tender-question-answer-form #questionanswerform-answer
201   -${question_form_answer_submit_btn_locator} jquery=.fancybox-is-open .fancybox-content #tender-question-answer-form .js-submit-btn
  197 +${question_form_open_btn_locator} = jquery=#aside-part-pjax a[href*="/tender/questions"]
  198 +${question_open_form_answer_btn_locator_tpl} = jquery=#tender-question-list .js-item div[data-title*="%title%"]
  199 +${question_form_open_form_answer_btn_locator_tpl} = jquery=#tender-question-list .js-item div[data-title*="%title%"] .btn.btn-default
  200 +${question_form_open_form_answer_input_locator} = jquery=.fancybox-is-open .fancybox-content #tender-question-answer-form #questionanswerform-answer
  201 +${question_form_answer_submit_btn_locator} = jquery=.fancybox-is-open .fancybox-content #tender-question-answer-form .js-submit-btn
202 202 ${plan_form_submit_success_msg} = відповідь на питання надана
203   -${question_form_create_question_btn_locator} jquery=.#aside-part-pjax [data-url*="/tender/question-create"]
204   -${question_form_create_questionform_related_of_input_locator} jquery=.fancybox-is-open .fancybox-content #questionform-related_of
205   -${question_form_create_questionform_related_item_input_locator} jquery=.fancybox-is-open .fancybox-content #questionform-related_item
206   -${question_form_create_questionform_related_item_input_locator_tpl} jquery=.fancybox-is-open .fancybox-content #questionform-related_item option:contains("%type_id%")
207   -${question_form_create_questionform_title_input_locator} jquery=.fancybox-is-open .fancybox-content #questionform-title
208   -${question_form_create_questionform_description_input_locator} jquery=.fancybox-is-open .fancybox-content #questionform-description
209   -${question_form_submit_success_msg} Запитання створене.
210   -${question_form_create_questionform_related_lot_input_locator} jquery=.fancybox-is-open .fancybox-content #questionform-related_lot
211   -${question_form_create_questionform_related_lot_input_locator} jquery=.fancybox-is-open .fancybox-content #questionform-related_lot
212   -${question_form_create_questionform_related_lot_input_locator_tpl} jquery=.fancybox-is-open .fancybox-content #questionform-related_lot option:contains("%type_id%")
  203 +${question_form_create_question_btn_locator} = jquery=.#aside-part-pjax [data-url*="/tender/question-create"]
  204 +${question_form_create_questionform_related_of_input_locator} = jquery=.fancybox-is-open .fancybox-content #questionform-related_of
  205 +${question_form_create_questionform_related_item_input_locator} = jquery=.fancybox-is-open .fancybox-content #questionform-related_item
  206 +${question_form_create_questionform_related_item_input_locator_tpl} = jquery=.fancybox-is-open .fancybox-content #questionform-related_item option:contains("%type_id%")
  207 +${question_form_create_questionform_title_input_locator} = jquery=.fancybox-is-open .fancybox-content #questionform-title
  208 +${question_form_create_questionform_description_input_locator} = jquery=.fancybox-is-open .fancybox-content #questionform-description
  209 +${question_form_submit_success_msg} = Запитання створене.
  210 +${question_form_create_questionform_related_lot_input_locator} = jquery=.fancybox-is-open .fancybox-content #questionform-related_lot
  211 +${question_form_create_questionform_related_lot_input_locator} = jquery=.fancybox-is-open .fancybox-content #questionform-related_lot
  212 +${question_form_create_questionform_related_lot_input_locator_tpl} = jquery=.fancybox-is-open .fancybox-content #questionform-related_lot option:contains("%type_id%")
213 213
214 214 #claim
215   -${claim_form_open_btn_locator} jquery=#aside-part-pjax a[href*="/tender/complaints"]
216   -${claim_form_complaintform_title_input_locator} jquery=.fancybox-is-open .fancybox-content input#complaintform-title
217   -${claim_form_complaintform_description_input_locator} jquery=.fancybox-is-open .fancybox-content input#complaintform-description
218   -${claim_form_complaintform_related_of_input_locator} jquery=.fancybox-is-open .fancybox-content #complaintform-related_of
219   -${claim_form_complaintform_related_lot_input_locator} jquery=.fancybox-is-open .fancybox-content #complaintform-related_lot
220   -${{claim_form_complaintform_related_item_input_locator_tpl} jquery=.fancybox-is-open .fancybox-content #complaintform-related_lot option:contains("%type_id%")
221   -${claim_form_complaintform_complaintform_type_input_locator} jquery=.fancybox-is-open .fancybox-content #complaintform-type
222   -${claim_form_complaintform_document_btn_locator} jquery=.fancybox-is-open .fancybox-content a[data-url*="/tender/get-complaint-document"]
223   -${claim_form_complaintform_submit_btn_locator} jquery=.fancybox-is-open .fancybox-content a[href*="/tender/complaints"]
  215 +${claim_form_open_btn_locator} = jquery=#aside-part-pjax a[href*="/tender/complaints"]
  216 +${claim_form_complaintform_title_input_locator} = jquery=.fancybox-is-open .fancybox-content input#complaintform-title
  217 +${claim_form_complaintform_description_input_locator} = jquery=.fancybox-is-open .fancybox-content input#complaintform-description
  218 +${claim_form_complaintform_related_of_input_locator} = jquery=.fancybox-is-open .fancybox-content #complaintform-related_of
  219 +${claim_form_complaintform_related_lot_input_locator} = jquery=.fancybox-is-open .fancybox-content #complaintform-related_lot
  220 +${claim_form_complaintform_related_item_input_locator_tpl} = jquery=.fancybox-is-open .fancybox-content #complaintform-related_lot option:contains("%type_id%")
  221 +${claim_form_complaintform_complaintform_type_input_locator} = jquery=.fancybox-is-open .fancybox-content #complaintform-type
  222 +${claim_form_complaintform_document_btn_locator} = jquery=.fancybox-is-open .fancybox-content a[data-url*="/tender/get-complaint-document"]
  223 +${claim_form_complaintform_submit_btn_locator} = jquery=.fancybox-is-open .fancybox-content a[href*="/tender/complaints"]
224 224 ${claim_uaid_text_locator} = jquery=#tender-complaint-list div.item.js-item:last .complaint-id span.value
225 225
226 226 #bids
227   -${bid_form_open_btn_locator} jquery=#aside-part-pjax a[href*="/tender/bid"]
228   -${bid_form_submit_success_msg} Пропозиція створена
229   -${bid_form_submit_edit_success_msg} Пропозиція відредагована
230   -${bid_form_feature_input_locator_tpl} jquery=.fancybox-is-open .fancybox-content select[id*="%title%-enum"]
231   -${bid_form_value_amount_input_locator} jquery=.fancybox-is-open .fancybox-content input[id*="-value_amount"]
232   -${bid_form_value_subcontracting_details_input_locator} jquery=.fancybox-is-open .fancybox-content textarea[id*="-subcontracting_details"]
233   -${bid_form_value_self_eligible_input_locator} jquery=.fancybox-is-open .fancybox-content input[id*="-self_eligible"]
234   -${bid_form_value_self_qualified_input_locator} jquery=.fancybox-is-open .fancybox-content input[id*="-self_qualified"]
235   -${bid_form_value_yearly_payments_percentage_input_locator} jquery=.fancybox-is-open .fancybox-content input[id*="-yearly_payments_percentage"]
236   -${bid_form_value_contract_duration_years_input_locator} jquery=.fancybox-is-open .fancybox-content input[id*="-contract_duration_years"]
237   -${bid_form_value_contract_duration_days_input_locator} jquery=.fancybox-is-open .fancybox-content input[id*="-contract_duration_days"]
238   -${bid_form_value_annual_costs_reduction_input_locator_tpl} jquery=.fancybox-is-open .fancybox-content input[id*="-annual_costs_reduction_%index%"]
239   -
240   -${bid_form_add_document_all_btn_locator} jquery=.fancybox-is-open .fancybox-content .field-bidform-documents input[type$="file"]
241   -${bid_form_add_document_type_input_locator} jquery=.fancybox-is-open .fancybox-content .field-bidform-documents select[id*="-document_type"]
242   -${bid_form_add_document_description_btn_locator} jquery=.fancybox-is-open .fancybox-content .field-bidform-documents [href$="#edit"]
243   -${bid_form_add_document_description_input_locator} jquery=.fancybox-is-open .fancybox-content .field-bidform-documents .popover.fade.top.in textarea[id*="-description"].form-control
244   -${bid_form_add_document_close_description_btn_locator} jquery=.fancybox-is-open .fancybox-content .field-bidform-documents .popover.fade.top.in [href$="#close"]
245   -${bid_form_submit_btn_locator} jquery=.fancybox-is-open .fancybox-content button.btn.btn-success
  227 +${bid_form_open_btn_locator} = jquery=#aside-part-pjax a[href*="/tender/bid"]
  228 +${bid_form_submit_success_msg} = Пропозиція створена
  229 +${bid_form_submit_edit_success_msg} = Пропозиція відредагована
  230 +${bid_form_feature_input_locator_tpl} = jquery=.fancybox-is-open .fancybox-content select[id*="%title%-enum"]
  231 +${bid_form_value_amount_input_locator} = jquery=.fancybox-is-open .fancybox-content input[id*="-value_amount"]
  232 +${bid_form_value_subcontracting_details_input_locator} = jquery=.fancybox-is-open .fancybox-content textarea[id*="-subcontracting_details"]
  233 +${bid_form_value_self_eligible_input_locator} = jquery=.fancybox-is-open .fancybox-content input[id*="-self_eligible"]
  234 +${bid_form_value_self_qualified_input_locator} = jquery=.fancybox-is-open .fancybox-content input[id*="-self_qualified"]
  235 +${bid_form_value_yearly_payments_percentage_input_locator} = jquery=.fancybox-is-open .fancybox-content input[id*="-yearly_payments_percentage"]
  236 +${bid_form_value_contract_duration_years_input_locator} = jquery=.fancybox-is-open .fancybox-content input[id*="-contract_duration_years"]
  237 +${bid_form_value_contract_duration_days_input_locator} = jquery=.fancybox-is-open .fancybox-content input[id*="-contract_duration_days"]
  238 +${bid_form_value_annual_costs_reduction_input_locator_tpl} = jquery=.fancybox-is-open .fancybox-content input[id*="-annual_costs_reduction_%index%"]
  239 +
  240 +${bid_form_add_document_all_btn_locator} = jquery=.fancybox-is-open .fancybox-content .field-bidform-documents input[type$="file"]
  241 +${bid_form_add_document_type_input_locator} = jquery=.fancybox-is-open .fancybox-content .field-bidform-documents select[id*="-document_type"]
  242 +${bid_form_add_document_description_btn_locator} = jquery=.fancybox-is-open .fancybox-content .field-bidform-documents [href$="#edit"]
  243 +${bid_form_add_document_description_input_locator} = jquery=.fancybox-is-open .fancybox-content .field-bidform-documents .popover.fade.top.in textarea[id*="-description"].form-control
  244 +${bid_form_add_document_close_description_btn_locator} = jquery=.fancybox-is-open .fancybox-content .field-bidform-documents .popover.fade.top.in [href$="#close"]
  245 +${bid_form_submit_btn_locator} = jquery=.fancybox-is-open .fancybox-content button.btn.btn-success
246 246
247 247
248 248
... ...
Please register or login to post a comment