Administrator / playtender-robot_tests · Commits

Commit eb89f2aae22eee665325f7481403287f26f3e26a

Authored by Oleksandr Iskryzhytskyi
2 parents 63b5a7b2 391d6ef1
build: skipped

Merge branch 'v3-dev' of https://git.4k.com.ua/root/playtender-robot_tests into v3-dev

Inline Side-by-side
Showing 5 changed files with 50 additions and 20 deletions
... ... @@ -149,10 +149,10 @@ Resource playtender_contr
149 149 [Documentation] Отримати значення поля field_name для тендера tender_uaid.
150 150
151 151 # fix for preventing error "Resolving variable '${award.value.amount}' failed: AttributeError: value" in next keywords for owner role
152   - run keyword if ${is_test_role_owner} and '${field_name}' == 'awards[0].complaintPeriod.endDate' fix awards data in global Users variable ${username}
  152 + run keyword if ${is_test_role_owner} and '${field_name}' in 'awards[0].complaintPeriod.endDate awards[1].complaintPeriod.endDate awards[2].complaintPeriod.endDate awards[3].complaintPeriod.endDate' fix awards data in global Users variable ${username}
153 153
154 154 open tender page by uaid ${tender_uaid}
155   - wait until page does not contain element with reloading ${tender_sync_element_locator}
  155 +# wait until page does not contain element with reloading ${tender_sync_element_locator}
156 156 run keyword if '${field_name}' == 'status' wait for tender status
157 157 run keyword if '${field_name}' == 'agreements[0].status' Wait Until Keyword Succeeds 1600 s 20 s wait for agreements status active
158 158 run keyword if '${field_name}' == 'qualificationPeriod.endDate' Wait Until Keyword Succeeds 1600 s 20 s Wait For QualificationsPeriodEnd
... ... @@ -685,7 +685,7 @@ Resource playtender_contr
685 685
686 686 open tender page by uaid ${tender_uaid}
687 687 open tender form qualification ${award_num}
688   - confirm award qualification ${username} ${award_num}
  688 + run keyword if ${award_num} != 3 confirm award qualification ${username} ${award_num}
689 689
690 690 Дискваліфікувати постачальника
691 691 [Arguments] ${username} ${tender_uaid} ${award_num}
... ... @@ -706,6 +706,14 @@ Resource playtender_contr
706 706 # wait until popup is visible
707 707 cancel award qualification
708 708
  709 +Затвердити постачальників
  710 + [Arguments] ${username} ${tender_uaid}
  711 + [Documentation] Перевести постачальників для тендера tender_uaid
  712 + ... в статус active.
  713 +
  714 + open tender page by uaid ${tender_uaid}
  715 + confirm awards
  716 +
709 717 ########################################################################################################################
710 718 ################################################### END QUALIFICATION KEYWORDS ########################################
711 719 ########################################################################################################################
... ... @@ -721,7 +729,7 @@ Resource playtender_contr
721 729 open tender form by uaid ${tender_uaid}
722 730 fill tender from award reporting ${supplier_data.data.value.amount} ${supplier_data.data.suppliers[0]}
723 731 run keyword and ignore error save tender form and wait synchronization
724   - confirm award
  732 + confirm award ${document}
725 733 ########################################################################################################################
726 734 ################################################### END LIMITED PROCUREMENT KEYWORDS ##################################
727 735 ########################################################################################################################
... ...
... ... @@ -165,7 +165,7 @@ get document complaint
165 165 click visible element ${claim_page_open_btn_locator}
166 166 click visible element and wait until page contains element ${claim_page_open_btn_locator} ${claim_form_open_btn_locator}
167 167 ${claim_form_resolved_input_locator} = replace string ${claim_form_resolved_input_locator_tpl} %complaint_id% ${complaintID}
168   - click visible element ${claim_form_resolved_input_locator}
  168 + open popup by btn locator ${claim_form_resolved_input_locator}
169 169 Wait Until Page Contains ${popup_opened_content_success_locator} 60
170 170 wait until element is visible ${claim_form_complaintform_submit_btn_locator} 60
171 171 ## wait until element is visible ${popup_opened_content_locator} 60
... ... @@ -186,13 +186,10 @@ get document complaint
186 186 wait until page contains element with reloading ${claim_open_form_answer_locator}
187 187 ${claim_form_open_form_answer_btn_locator} = replace string ${claim_form_open_form_answer_btn_locator_tpl} %title% ${complaintID}
188 188 wait until page contains element with reloading ${claim_form_open_form_answer_btn_locator}
189   - submit form and check result ${claim_form_open_form_answer_btn_locator} ${None} ${popup_opened_content_locator}
  189 + open popup by btn locator ${claim_form_open_form_answer_btn_locator}
190 190 Wait Until Page Contains ${popup_opened_content_success_locator} 60
191 191 wait until element is visible ${claim_form_answer_resolution_value_locator} 60
192   -## wait until element is visible ${popup_opened_content_locator} 60
193   -# click visible element ${claim_form_open_form_answer_btn_locator}
194 192
195   -# wait until popup is visible
196 193 input text to exist visible input ${claim_form_answer_resolution_value_locator} ${answer_data.data.resolution}
197 194 Run Keyword If '${answer_data.data.resolutionType}' == 'resolved' select from list by value ${claim_form_answer_resolution_type_value_locator} resolved
198 195 Run Keyword If '${answer_data.data.resolutionType}' == 'declined' select from list by value ${claim_form_answer_resolution_type_value_locator} declined
... ...
... ... @@ -94,11 +94,19 @@ open tender form qualification
94 94 [Arguments] ${award_num}
95 95 [Documentation] Відкрити форму кваліфікації і потрібну кваліфікацію під номером award_num
96 96
97   - run keyword if ${award_num} == 0 wait until page contains element with reloading ${qualification_form_0_open_btn_locator}
98   - run keyword if ${award_num} == 0 click visible element ${qualification_form_0_open_btn_locator}
  97 + run keyword if "${mode}" not in "open_framework" Run Keywords
  98 + ... run keyword if ${award_num} == 0 wait until page contains element with reloading ${qualification_form_0_open_btn_locator}
  99 + ... AND run keyword if ${award_num} == 0 click visible element ${qualification_form_0_open_btn_locator}
99 100 ##### BOF - TMP #####
100   - run keyword if ${award_num} == 1 or ${award_num} == -1 click visible element ${qualification_form_0_open_btn_locator}
101   - run keyword if ${award_num} == 2 click visible element ${qualification_form_0_open_btn_locator}
  101 + ... AND run keyword if ${award_num} == 1 or ${award_num} == -1 click visible element ${qualification_form_0_open_btn_locator}
  102 + ... AND run keyword if ${award_num} == 2 click visible element ${qualification_form_0_open_btn_locator}
  103 + ... ELSE IF "${mode}" in "open_framework" Run Keywords
  104 + ... run keyword if ${award_num} == 0 wait until page contains element with reloading ${qualification_form_0_open_btn_locator}
  105 + ... AND run keyword if ${award_num} == 0 click visible element ${qualification_form_0_open_btn_locator}
  106 +##### BOF - TMP #####
  107 + ... AND run keyword if ${award_num} == 1 or ${award_num} == -1 click visible element ${qualification_form_1_open_btn_locator}
  108 + ... AND run keyword if ${award_num} == 2 click visible element ${qualification_form_2_open_btn_locator}
  109 +# ... AND run keyword if ${award_num} == 3 click visible element ${qualification_form_3_open_btn_locator}
102 110 ##### EOF - TMP #####
103 111 # run keyword if ${award_num} == 1 or ${award_num} == -1 click visible element ${qualification_form_1_open_btn_locator}
104 112
... ... @@ -235,6 +243,7 @@ cancel award qualification
235 243
236 244 #qualification awawd reporting and negotiotion
237 245 confirm award
  246 + [Arguments] ${document}
238 247 [Documentation] Перевести постачальника в статус active.
239 248
240 249 run keyword and ignore error run keyword if '${mode}' in 'negotiation reporting' Wait Until Page Contains ${award_form_negotiation_submit_success_msg} 60
... ... @@ -242,19 +251,18 @@ confirm award
242 251 run keyword and ignore error run keyword if '${mode}' in 'negotiation reporting' close current visible alert
243 252
244 253 capture page screenshot
245   - capture page screenshot
246 254 wait until page contains element with reloading ${qualification_form_0_open_btn_locator}
247 255 click visible element ${qualification_form_0_open_btn_locator}
248 256 Wait Until Page Contains ${popup_opened_content_success_locator} 60
249 257 run keyword and ignore error wait until element is visible ${tender_status_active_qualification_value_locator} 10
250 258 wait until element is visible ${qualification_form_submit_btn_locator} 60
251   - ${file_path} ${file_name} ${file_content} = create_fake_doc
  259 +# ${file_path} ${file_name} ${file_content} = create_fake_doc
252 260 Execute Javascript $('#qualificationform-decision').val('accept').change()
253 261 capture page screenshot
254 262 run keyword and ignore error wait until page contains element ${award_form_qualified_input_locator}
255 263 capture page screenshot
256 264 run keyword and ignore error click visible element ${award_form_qualified_input_locator}
257   - choose file ${add_file_to_qualification_form_locator} ${file_path}
  265 + choose file ${add_file_to_qualification_form_locator} ${document}
258 266 wait until page does not contain element ${popup_dynamic_form_loading_element_locator} 60
259 267 wait until element is visible ${qualification_form_add_document_type_input_locator} 60
260 268 # submit current visible popup
... ... @@ -298,4 +306,16 @@ confirm award
298 306 run keyword and ignore error submit form and check result ${qualification_form_submit_btn_locator} ${qualification_award_after_ecp_form_submit_success_msg} ${None}
299 307 capture page screenshot
300 308
  309 +confirm awards
  310 + [Documentation] Перевести постачальників для тендера tender_uaid
  311 + ... в статус active.
  312 +
  313 + click visible element ${qualification_agreement_form_approve_submit_btn_locator}
  314 + wait until page contains ${qualification_form_approve_question_msg}
  315 + Execute Javascript ${qualification_form_approve_js_submit_btn_locator}
  316 + Wait Until Page Contains ${qualification_agreement_form_approve_success_msg} 60
  317 + wait until alert is visible ${qualification_agreement_form_approve_success_msg}
  318 + run keyword and ignore error run keyword if condition is not none ${qualification_agreement_form_approve_success_msg} close current visible alert
  319 + Wait Until Keyword Succeeds 800 s 20 s Wait For QualificationsPeriodEnd
  320 +
301 321
... ...
... ... @@ -3,7 +3,8 @@
3 3 #qualification
4 4 ${prequalification_form_0_open_btn_locator} = jquery=#bids-pjax .pseudo-table__row:nth(1) a[href*="/tender/prequalification"]
5 5 ${prequalification_form_1_open_btn_locator} = jquery=#bids-pjax .pseudo-table__row:nth(2) a[href*="/tender/prequalification"]
6   -${prequalification_form_2_open_btn_locator} = jquery=#bids-pjax .pseudo-table__row:last a[href*="/tender/prequalification"]
  6 +${prequalification_form_2_open_btn_locator} = jquery=#bids-pjax .pseudo-table__row:nth(3) a[href*="/tender/prequalification"]
  7 +${prequalification_form_3_open_btn_locator} = jquery=#bids-pjax .pseudo-table__row:nth(4) a[href*="/tender/prequalification"]
7 8 ${prequalification_form_approve_open_btn_locator} = jquery=.aside__inner a[href*="/tender/prequalification-approve"]
8 9 ${prequalification_form_accept_input_locator} = $('#prequalificationform-decision').val('accept').change()
9 10 ${prequalification_form_decline_input_locator} = $('#prequalificationform-decision').val('decline').change()
... ... @@ -23,9 +24,13 @@ ${qualification_form_submit_btn_locator} = jquery=.fanc
23 24 ${qualification_form_approve_submit_btn_locator} = jquery=.jconfirm-box-container .btn.btn-default
24 25 ${qualification_form_approve_success_msg} = Прекваліфікація підтверджена, дочекайтесь опублікування на сайті уповноваженого органу.
25 26 ${qualification_form_approve_js_submit_btn_locator} = $('.jconfirm-box-container .btn.btn-default').click()
  27 +${qualification_agreement_form_approve_submit_btn_locator} = jquery=.aside__inner a.js-qualification-approve
  28 +${qualification_agreement_form_approve_success_msg} = Кваліфікація підтверджена, дочекайтесь опублікування на сайті уповноваженого органу.
26 29
27   -${qualification_form_0_open_btn_locator} = jquery=#bids-pjax .pseudo-table__row a[href*="/tender/qualification"]
28   -${qualification_form_1_open_btn_locator} = jquery=#bids-pjax .pseudo-table__row:last a[href*="/tender/qualification"]
  30 +${qualification_form_0_open_btn_locator} = jquery=#bids-pjax .pseudo-table__row:nth(1) a[href*="/tender/qualification"]
  31 +${qualification_form_1_open_btn_locator} = jquery=#bids-pjax .pseudo-table__row:nth(2) a[href*="/tender/qualification"]
  32 +${qualification_form_2_open_btn_locator} = jquery=#bids-pjax .pseudo-table__row:nth(3) a[href*="/tender/qualification"]
  33 +${qualification_form_3_open_btn_locator} = jquery=#bids-pjax .pseudo-table__row:nth(4) a[href*="/tender/qualification"]
29 34 ${qualification_form_eligible_input_locator} = jquery=#qualificationform-eligible
30 35 ${qualification_form_qualified_input_locator} = jquery=#qualificationform-qualified
31 36 ${qualification_award_form_submit_success_msg} = Рішення завантажене, тепер потрібно накласти ЕЦП/КЕП.
... ...
... ... @@ -424,7 +424,7 @@ activate stage 2
424 424 [Documentation] Перевести тендер tender_uaid в статус active.tendering.
425 425
426 426 open popup by btn locator ${tender_form_general_panel_edit_btn_locator}
427   - ${tender_end_date} = Get Current Date increment=00:25:00 result_format=%Y-%m-%dT%H:%M:%S.%f%z+02:00
  427 + ${tender_end_date} = Get Current Date increment=00:35:00 result_format=%Y-%m-%dT%H:%M:%S.%f%z+02:00
428 428 # ${tender_end_date} = Get Current Date increment=00:25:00 result_format=%d.%m.%Y %H:%M
429 429 input datetime to visible input ${tender_tender_period_end_date_input_locator} ${tender_end_date}
430 430 capture page screenshot
... ...
Please register or login to post a comment