variables = and fix features prepare

@@ -232,8 +232,9 @@ def prepare_tender_data(data):
                         i = i - 1
                         i = i - 1
             i = i + 1
             i = i + 1
 
 
-    if len(data['features']) == 0:
-        del data['features']
+    if 'features' in data:
+        if len(data['features']) == 0:
+            del data['features']
 
 
     # moves items to its related lots
     # moves items to its related lots
     i = 0
     i = 0

@@ -113,8 +113,8 @@ ${tender_tender_period_start_date_input_locator} =                  jquery=[id$=
 ${tender_tender_period_end_date_input_locator} =                    jquery=[id$="form-tender_period_end_date"]
 ${tender_tender_period_end_date_input_locator} =                    jquery=[id$="form-tender_period_end_date"]
 ${tender_tender_quick_mode_locator} =                               jquery=[id$="form-quick_mode"]
 ${tender_tender_quick_mode_locator} =                               jquery=[id$="form-quick_mode"]
 #esco
 #esco
-${tender_form_general_funding_kind_input_locator}                   id=tenderescoform-funding_kind
-${tender_form_general_nbu_discount_rate_input_locator}              id=tenderescoform-nbu_discount_rate
+${tender_form_general_funding_kind_input_locator} =                 id=tenderescoform-funding_kind
+${tender_form_general_nbu_discount_rate_input_locator} =            id=tenderescoform-nbu_discount_rate
 #closeframework
 #closeframework
 ${tender_form_general_max_awards_count_input_locator} =             jquery=[id$="form-max_awards_count"]
 ${tender_form_general_max_awards_count_input_locator} =             jquery=[id$="form-max_awards_count"]
 ${tender_form_general_agreement_duration_years_input_locator} =     jquery=[id$="form-agreement_duration_years"]
 ${tender_form_general_agreement_duration_years_input_locator} =     jquery=[id$="form-agreement_duration_years"]
@@ -184,9 +184,9 @@ ${tender_uaid_text_locator} =                                       jquery=#tend
 ${tender_edit_btn_locator} =                                        jquery=#aside-part-pjax a[href*='tender/update']
 ${tender_edit_btn_locator} =                                        jquery=#aside-part-pjax a[href*='tender/update']
 
 
 #елемент проверки загрузки формы в попапе
 #елемент проверки загрузки формы в попапе
-${popup_dynamic_form_loading_element_locator}                       jquery=.fancybox-is-open .btn-add .fa-spin
+${popup_dynamic_form_loading_element_locator} =                     jquery=.fancybox-is-open .btn-add .fa-spin
 #${add_file_to_form}                                                 xpath=//input[@type='file']
 #${add_file_to_form}                                                 xpath=//input[@type='file']
-${add_file_to_form_locator}                                         jquery=.fancybox-is-open input[type$='file']
+${add_file_to_form_locator}  =                                      jquery=.fancybox-is-open input[type$='file']
 
 
 # tender index + search
 # tender index + search
 ${tender_search_form_locator} =                                     id=tender-filter-form
 ${tender_search_form_locator} =                                     id=tender-filter-form
@@ -194,55 +194,55 @@ ${tender_search_form_query_input_locator} =                         jquery=#tend
 ${tender_search_form_result_locator_tpl} =                          jquery=#tender-list .lots__item .lot__characteristic li:contains(%query%)
 ${tender_search_form_result_locator_tpl} =                          jquery=#tender-list .lots__item .lot__characteristic li:contains(%query%)
 
 
 #question
 #question
-${question_form_open_btn_locator}                                   jquery=#aside-part-pjax a[href*="/tender/questions"]
-${question_open_form_answer_btn_locator_tpl}                        jquery=#tender-question-list .js-item div[data-title*="%title%"]
-${question_form_open_form_answer_btn_locator_tpl}                   jquery=#tender-question-list .js-item div[data-title*="%title%"] .btn.btn-default
-${question_form_open_form_answer_input_locator}                     jquery=.fancybox-is-open .fancybox-content #tender-question-answer-form #questionanswerform-answer
-${question_form_answer_submit_btn_locator}                          jquery=.fancybox-is-open .fancybox-content #tender-question-answer-form .js-submit-btn
+${question_form_open_btn_locator}  =                                jquery=#aside-part-pjax a[href*="/tender/questions"]
+${question_open_form_answer_btn_locator_tpl} =                      jquery=#tender-question-list .js-item div[data-title*="%title%"]
+${question_form_open_form_answer_btn_locator_tpl} =                 jquery=#tender-question-list .js-item div[data-title*="%title%"] .btn.btn-default
+${question_form_open_form_answer_input_locator} =                   jquery=.fancybox-is-open .fancybox-content #tender-question-answer-form #questionanswerform-answer
+${question_form_answer_submit_btn_locator} =                        jquery=.fancybox-is-open .fancybox-content #tender-question-answer-form .js-submit-btn
 ${plan_form_submit_success_msg} =                                   відповідь на питання надана
 ${plan_form_submit_success_msg} =                                   відповідь на питання надана
-${question_form_create_question_btn_locator}                        jquery=.#aside-part-pjax [data-url*="/tender/question-create"]
-${question_form_create_questionform_related_of_input_locator}       jquery=.fancybox-is-open .fancybox-content #questionform-related_of
-${question_form_create_questionform_related_item_input_locator}     jquery=.fancybox-is-open .fancybox-content #questionform-related_item
-${question_form_create_questionform_related_item_input_locator_tpl}   jquery=.fancybox-is-open .fancybox-content #questionform-related_item option:contains("%type_id%")
-${question_form_create_questionform_title_input_locator}            jquery=.fancybox-is-open .fancybox-content #questionform-title
-${question_form_create_questionform_description_input_locator}      jquery=.fancybox-is-open .fancybox-content #questionform-description
-${question_form_submit_success_msg}                                 Запитання створене.
-${question_form_create_questionform_related_lot_input_locator}      jquery=.fancybox-is-open .fancybox-content #questionform-related_lot
-${question_form_create_questionform_related_lot_input_locator}      jquery=.fancybox-is-open .fancybox-content #questionform-related_lot
-${question_form_create_questionform_related_lot_input_locator_tpl}  jquery=.fancybox-is-open .fancybox-content #questionform-related_lot option:contains("%type_id%")
+${question_form_create_question_btn_locator} =                      jquery=.#aside-part-pjax [data-url*="/tender/question-create"]
+${question_form_create_questionform_related_of_input_locator} =     jquery=.fancybox-is-open .fancybox-content #questionform-related_of
+${question_form_create_questionform_related_item_input_locator} =   jquery=.fancybox-is-open .fancybox-content #questionform-related_item
+${question_form_create_questionform_related_item_input_locator_tpl} =  jquery=.fancybox-is-open .fancybox-content #questionform-related_item option:contains("%type_id%")
+${question_form_create_questionform_title_input_locator} =          jquery=.fancybox-is-open .fancybox-content #questionform-title
+${question_form_create_questionform_description_input_locator} =    jquery=.fancybox-is-open .fancybox-content #questionform-description
+${question_form_submit_success_msg} =                               Запитання створене.
+${question_form_create_questionform_related_lot_input_locator} =    jquery=.fancybox-is-open .fancybox-content #questionform-related_lot
+${question_form_create_questionform_related_lot_input_locator} =    jquery=.fancybox-is-open .fancybox-content #questionform-related_lot
+${question_form_create_questionform_related_lot_input_locator_tpl} =  jquery=.fancybox-is-open .fancybox-content #questionform-related_lot option:contains("%type_id%")
 
 
 #claim
 #claim
-${claim_form_open_btn_locator}                                      jquery=#aside-part-pjax a[href*="/tender/complaints"]
-${claim_form_complaintform_title_input_locator}                     jquery=.fancybox-is-open .fancybox-content input#complaintform-title
-${claim_form_complaintform_description_input_locator}               jquery=.fancybox-is-open .fancybox-content input#complaintform-description
-${claim_form_complaintform_related_of_input_locator}                jquery=.fancybox-is-open .fancybox-content #complaintform-related_of
-${claim_form_complaintform_related_lot_input_locator}               jquery=.fancybox-is-open .fancybox-content #complaintform-related_lot
-${{claim_form_complaintform_related_item_input_locator_tpl}         jquery=.fancybox-is-open .fancybox-content #complaintform-related_lot option:contains("%type_id%")
-${claim_form_complaintform_complaintform_type_input_locator}        jquery=.fancybox-is-open .fancybox-content #complaintform-type
-${claim_form_complaintform_document_btn_locator}                    jquery=.fancybox-is-open .fancybox-content a[data-url*="/tender/get-complaint-document"]
-${claim_form_complaintform_submit_btn_locator}                      jquery=.fancybox-is-open .fancybox-content a[href*="/tender/complaints"]
+${claim_form_open_btn_locator} =                                    jquery=#aside-part-pjax a[href*="/tender/complaints"]
+${claim_form_complaintform_title_input_locator} =                   jquery=.fancybox-is-open .fancybox-content input#complaintform-title
+${claim_form_complaintform_description_input_locator} =             jquery=.fancybox-is-open .fancybox-content input#complaintform-description
+${claim_form_complaintform_related_of_input_locator} =              jquery=.fancybox-is-open .fancybox-content #complaintform-related_of
+${claim_form_complaintform_related_lot_input_locator} =             jquery=.fancybox-is-open .fancybox-content #complaintform-related_lot
+${claim_form_complaintform_related_item_input_locator_tpl} =        jquery=.fancybox-is-open .fancybox-content #complaintform-related_lot option:contains("%type_id%")
+${claim_form_complaintform_complaintform_type_input_locator} =      jquery=.fancybox-is-open .fancybox-content #complaintform-type
+${claim_form_complaintform_document_btn_locator} =                  jquery=.fancybox-is-open .fancybox-content a[data-url*="/tender/get-complaint-document"]
+${claim_form_complaintform_submit_btn_locator} =                    jquery=.fancybox-is-open .fancybox-content a[href*="/tender/complaints"]
 ${claim_uaid_text_locator} =                                        jquery=#tender-complaint-list div.item.js-item:last .complaint-id span.value
 ${claim_uaid_text_locator} =                                        jquery=#tender-complaint-list div.item.js-item:last .complaint-id span.value
 
 
 #bids
 #bids
-${bid_form_open_btn_locator}                                        jquery=#aside-part-pjax a[href*="/tender/bid"]
-${bid_form_submit_success_msg}                                      Пропозиція створена
-${bid_form_submit_edit_success_msg}                                 Пропозиція відредагована
-${bid_form_feature_input_locator_tpl}                               jquery=.fancybox-is-open .fancybox-content select[id*="%title%-enum"]
-${bid_form_value_amount_input_locator}                              jquery=.fancybox-is-open .fancybox-content input[id*="-value_amount"]
-${bid_form_value_subcontracting_details_input_locator}              jquery=.fancybox-is-open .fancybox-content textarea[id*="-subcontracting_details"]
-${bid_form_value_self_eligible_input_locator}                       jquery=.fancybox-is-open .fancybox-content input[id*="-self_eligible"]
-${bid_form_value_self_qualified_input_locator}                      jquery=.fancybox-is-open .fancybox-content input[id*="-self_qualified"]
-${bid_form_value_yearly_payments_percentage_input_locator}          jquery=.fancybox-is-open .fancybox-content input[id*="-yearly_payments_percentage"]
-${bid_form_value_contract_duration_years_input_locator}             jquery=.fancybox-is-open .fancybox-content input[id*="-contract_duration_years"]
-${bid_form_value_contract_duration_days_input_locator}              jquery=.fancybox-is-open .fancybox-content input[id*="-contract_duration_days"]
-${bid_form_value_annual_costs_reduction_input_locator_tpl}          jquery=.fancybox-is-open .fancybox-content input[id*="-annual_costs_reduction_%index%"]
-
-${bid_form_add_document_all_btn_locator}                            jquery=.fancybox-is-open .fancybox-content .field-bidform-documents input[type$="file"]
-${bid_form_add_document_type_input_locator}                         jquery=.fancybox-is-open .fancybox-content .field-bidform-documents select[id*="-document_type"]
-${bid_form_add_document_description_btn_locator}                    jquery=.fancybox-is-open .fancybox-content .field-bidform-documents [href$="#edit"]
-${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
-${bid_form_add_document_close_description_btn_locator}              jquery=.fancybox-is-open .fancybox-content .field-bidform-documents .popover.fade.top.in [href$="#close"]
-${bid_form_submit_btn_locator}                                      jquery=.fancybox-is-open .fancybox-content button.btn.btn-success
+${bid_form_open_btn_locator} =                                      jquery=#aside-part-pjax a[href*="/tender/bid"]
+${bid_form_submit_success_msg} =                                    Пропозиція створена
+${bid_form_submit_edit_success_msg} =                               Пропозиція відредагована
+${bid_form_feature_input_locator_tpl} =                             jquery=.fancybox-is-open .fancybox-content select[id*="%title%-enum"]
+${bid_form_value_amount_input_locator} =                            jquery=.fancybox-is-open .fancybox-content input[id*="-value_amount"]
+${bid_form_value_subcontracting_details_input_locator} =            jquery=.fancybox-is-open .fancybox-content textarea[id*="-subcontracting_details"]
+${bid_form_value_self_eligible_input_locator} =                     jquery=.fancybox-is-open .fancybox-content input[id*="-self_eligible"]
+${bid_form_value_self_qualified_input_locator} =                    jquery=.fancybox-is-open .fancybox-content input[id*="-self_qualified"]
+${bid_form_value_yearly_payments_percentage_input_locator} =        jquery=.fancybox-is-open .fancybox-content input[id*="-yearly_payments_percentage"]
+${bid_form_value_contract_duration_years_input_locator} =           jquery=.fancybox-is-open .fancybox-content input[id*="-contract_duration_years"]
+${bid_form_value_contract_duration_days_input_locator} =            jquery=.fancybox-is-open .fancybox-content input[id*="-contract_duration_days"]
+${bid_form_value_annual_costs_reduction_input_locator_tpl} =        jquery=.fancybox-is-open .fancybox-content input[id*="-annual_costs_reduction_%index%"]
+
+${bid_form_add_document_all_btn_locator} =                          jquery=.fancybox-is-open .fancybox-content .field-bidform-documents input[type$="file"]
+${bid_form_add_document_type_input_locator} =                       jquery=.fancybox-is-open .fancybox-content .field-bidform-documents select[id*="-document_type"]
+${bid_form_add_document_description_btn_locator} =                  jquery=.fancybox-is-open .fancybox-content .field-bidform-documents [href$="#edit"]
+${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
+${bid_form_add_document_close_description_btn_locator} =            jquery=.fancybox-is-open .fancybox-content .field-bidform-documents .popover.fade.top.in [href$="#close"]
+${bid_form_submit_btn_locator} =                                    jquery=.fancybox-is-open .fancybox-content button.btn.btn-success