Commit d0e335faae43ab7b1449ba16db520ec3eafe60b3
1 parent
007c50bf
editing lot creation after updating
Showing
2 changed files
with
10 additions
and
2 deletions
@@ -99,9 +99,11 @@ fill tender general info | @@ -99,9 +99,11 @@ fill tender general info | ||
99 | run keyword if condition is not none ${procurement_method_type} select from list by value ${tender_form_procurement_method_type_input_locator} ${procurement_method_type} | 99 | run keyword if condition is not none ${procurement_method_type} select from list by value ${tender_form_procurement_method_type_input_locator} ${procurement_method_type} |
100 | wait until page does not contain element ${tender_load_form_after_mode_locator} | 100 | wait until page does not contain element ${tender_load_form_after_mode_locator} |
101 | 101 | ||
102 | + capture page screenshot | ||
102 | ${lots} = get from dictionary by keys ${data} lots | 103 | ${lots} = get from dictionary by keys ${data} lots |
103 | run keyword if condition is not none ${lots} Run Keyword And Ignore Error Execute Javascript $('[id$="form-is_multilot"]').click() | 104 | run keyword if condition is not none ${lots} Run Keyword And Ignore Error Execute Javascript $('[id$="form-is_multilot"]').click() |
104 | wait until page does not contain element ${tender_load_form_after_mode_locator} 20 | 105 | wait until page does not contain element ${tender_load_form_after_mode_locator} 20 |
106 | + capture page screenshot | ||
105 | 107 | ||
106 | open popup by btn locator ${plan_form_general_panel_edit_btn_locator} | 108 | open popup by btn locator ${plan_form_general_panel_edit_btn_locator} |
107 | ${plan_path} = Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml | 109 | ${plan_path} = Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml |
@@ -440,12 +442,16 @@ fill tender form lots | @@ -440,12 +442,16 @@ fill tender form lots | ||
440 | ${prepared_tender_data} = Get From Dictionary ${td_railway_crutch} data | 442 | ${prepared_tender_data} = Get From Dictionary ${td_railway_crutch} data |
441 | ${milestones1} = Run Keyword If "${mode}" in "negotiation" Get From Dictionary ${prepared_tender_data} milestones | 443 | ${milestones1} = Run Keyword If "${mode}" in "negotiation" Get From Dictionary ${prepared_tender_data} milestones |
442 | ##### EOF - TMP ##### | 444 | ##### EOF - TMP ##### |
445 | + capture page screenshot | ||
443 | :FOR ${lot_attributes} IN @{lot_attributes_array} | 446 | :FOR ${lot_attributes} IN @{lot_attributes_array} |
444 | \ run keyword if '${mode}' not in 'open_framework' open popup by btn locator ${tender_form_lots_panel_edit_btn_locator} | 447 | \ run keyword if '${mode}' not in 'open_framework' open popup by btn locator ${tender_form_lots_panel_edit_btn_locator} |
445 | - \ ... ELSE click visible element ${tender_form_lots_edit_lot1_btn_locator} | 448 | + \ ... ELSE Execute Javascript $('#Lots #collapseLots #Lots0 .actions-wrapper a.btn.btn-default.btn-update.js-form-popup-update:first').click() |
449 | +# \ run keyword if '${mode}' not in 'open_framework' open popup by btn locator ${tender_form_lots_panel_edit_btn_locator} | ||
450 | +# \ ... ELSE click visible element ${tender_form_lots_edit_lot1_btn_locator} | ||
446 | # \ open popup by btn locator ${tender_form_lots_panel_edit_btn_locator} | 451 | # \ open popup by btn locator ${tender_form_lots_panel_edit_btn_locator} |
447 | # \ click visible element ${tender_form_lots_panel_edit_btn_locator} | 452 | # \ click visible element ${tender_form_lots_panel_edit_btn_locator} |
448 | # \ wait until popup is visible | 453 | # \ wait until popup is visible |
454 | + \ capture page screenshot | ||
449 | \ fill lot form in opened popup ${lot_attributes} | 455 | \ fill lot form in opened popup ${lot_attributes} |
450 | \ submit current visible popup | 456 | \ submit current visible popup |
451 | \ ${features} = get from dictionary by keys ${lot_attributes} features | 457 | \ ${features} = get from dictionary by keys ${lot_attributes} features |
@@ -455,6 +461,7 @@ fill tender form lots | @@ -455,6 +461,7 @@ fill tender form lots | ||
455 | \ run keyword if condition is none ${milestones} run keyword if "${mode}" in "negotiation" fill tender form milestones ${milestones1} | 461 | \ run keyword if condition is none ${milestones} run keyword if "${mode}" in "negotiation" fill tender form milestones ${milestones1} |
456 | \ ${items} = get from dictionary by keys ${lot_attributes} items | 462 | \ ${items} = get from dictionary by keys ${lot_attributes} items |
457 | \ run keyword if condition is not none ${items} fill tender form items ${items} | 463 | \ run keyword if condition is not none ${items} fill tender form items ${items} |
464 | + capture page screenshot | ||
458 | 465 | ||
459 | fill tender form lots 2 stage | 466 | fill tender form lots 2 stage |
460 | [Arguments] ${lot_attributes_array} | 467 | [Arguments] ${lot_attributes_array} |
@@ -154,7 +154,8 @@ ${milestone_form_popup_code_input_locator} = jquery=.fanc | @@ -154,7 +154,8 @@ ${milestone_form_popup_code_input_locator} = jquery=.fanc | ||
154 | ${milestone_form_popup_duration_days_input_locator} = jquery=.fancybox-is-open:last .tab-content:first > .tab-pane.active:first [id$="-duration_days"] | 154 | ${milestone_form_popup_duration_days_input_locator} = jquery=.fancybox-is-open:last .tab-content:first > .tab-pane.active:first [id$="-duration_days"] |
155 | ${milestone_form_popup_duration_type_input_locator} = jquery=.fancybox-is-open:last .tab-content:first > .tab-pane.active:first [id$="-duration_type"] | 155 | ${milestone_form_popup_duration_type_input_locator} = jquery=.fancybox-is-open:last .tab-content:first > .tab-pane.active:first [id$="-duration_type"] |
156 | 156 | ||
157 | -${tender_form_lots_panel_edit_btn_locator} = jquery=a.btn.btn-default.btn-update.js-form-popup-add | 157 | +${tender_form_lots_panel_edit_btn_locator} = jquery=#Lots0 a.btn.btn-default.btn-update[data-url*="#lots0-form-popup"] |
158 | +#${tender_form_lots_panel_edit_btn_locator} = jquery=a.btn.btn-default.btn-update.js-form-popup-add | ||
158 | ${lot_form_popup_add_btn_locator} = jquery=[href$="#add-milestones"] | 159 | ${lot_form_popup_add_btn_locator} = jquery=[href$="#add-milestones"] |
159 | ${lot_form_popup_title_input_locator} = jquery=.fancybox-is-open [id$="-title"] | 160 | ${lot_form_popup_title_input_locator} = jquery=.fancybox-is-open [id$="-title"] |
160 | ${lot_form_popup_description_input_locator} = jquery=.fancybox-is-open [id$="-description"] | 161 | ${lot_form_popup_description_input_locator} = jquery=.fancybox-is-open [id$="-description"] |
Please
register
or
login
to post a comment