Commit eebb0c919021792a58b422effddadafde61a90d6

Authored by Playtenders
1 parent f7b7651a

egotiation and refactoring

@@ -13,16 +13,9 @@ Resource playtender_claim @@ -13,16 +13,9 @@ Resource playtender_claim
13 open tender page by uaid ${tender_uaid} 13 open tender page by uaid ${tender_uaid}
14 click visible element ${claim_page_open_btn_locator} 14 click visible element ${claim_page_open_btn_locator}
15 capture page screenshot 15 capture page screenshot
16 -# wait until page contains element with reloading ${claim_form_open_btn_locator}  
17 -# click visible element and wait until page contains element ${claim_page_open_btn_locator} ${claim_form_open_btn_locator}  
18 -## submit form and check result ${claim_form_open_btn_locator} ${None} ${popup_opened_content_locator}  
19 wait until page contains element with reloading ${claim_form_open_btn_locator} 16 wait until page contains element with reloading ${claim_form_open_btn_locator}
20 - click visible element ${claim_form_open_btn_locator}  
21 - Wait Until Page Contains ${popup_opened_content_success_locator} 60  
22 - wait until element is visible ${claim_form_complaintform_submit_btn_locator} 60  
23 -## wait until element is visible ${popup_opened_content_locator} 60 17 + open popup by btn locator ${claim_form_open_btn_locator}
24 capture page screenshot 18 capture page screenshot
25 -# wait until popup is visible  
26 input text to exist visible input ${claim_form_complaintform_title_input_locator} ${claim.data.title} 19 input text to exist visible input ${claim_form_complaintform_title_input_locator} ${claim.data.title}
27 capture page screenshot 20 capture page screenshot
28 input text to exist visible input ${claim_form_complaintform_description_input_locator} ${claim.data.description} 21 input text to exist visible input ${claim_form_complaintform_description_input_locator} ${claim.data.description}
@@ -67,14 +60,8 @@ Resource playtender_claim @@ -67,14 +60,8 @@ Resource playtender_claim
67 wait until page contains element with reloading ${claim_open_form_answer_locator} 60 wait until page contains element with reloading ${claim_open_form_answer_locator}
68 ${claim_form_cancel_open_btn_locator} = replace string ${claim_form_cancel_open_btn_locator_tpl} %complaint_id% ${complaintID} 61 ${claim_form_cancel_open_btn_locator} = replace string ${claim_form_cancel_open_btn_locator_tpl} %complaint_id% ${complaintID}
69 wait until page contains element with reloading ${claim_form_cancel_open_btn_locator} 62 wait until page contains element with reloading ${claim_form_cancel_open_btn_locator}
70 - click visible element ${claim_form_cancel_open_btn_locator}  
71 -# submit form and check result ${claim_form_cancel_open_btn_locator} ${None} ${popup_opened_content_locator} 63 + open popup by btn locator ${claim_form_cancel_open_btn_locator}
72 capture page screenshot 64 capture page screenshot
73 - Wait Until Page Contains ${popup_opened_content_success_locator} 60  
74 - wait until element is visible ${claim_form_cancellation_reason_input_locator} 60  
75 -## wait until element is visible ${popup_opened_content_locator} 60  
76 - capture page screenshot  
77 -# wait until popup is visible  
78 input text to exist visible input ${claim_form_cancellation_reason_input_locator} ${cancellation_data.data.cancellationReason} 65 input text to exist visible input ${claim_form_cancellation_reason_input_locator} ${cancellation_data.data.cancellationReason}
79 capture page screenshot 66 capture page screenshot
80 submit form and check result ${claim_form_complaintform_submit_btn_locator} ${claim_cancel_submit_success_msg} ${tender_created_checker_element_locator} 67 submit form and check result ${claim_form_complaintform_submit_btn_locator} ${claim_cancel_submit_success_msg} ${tender_created_checker_element_locator}
@@ -166,9 +153,6 @@ get document complaint @@ -166,9 +153,6 @@ get document complaint
166 click visible element and wait until page contains element ${claim_page_open_btn_locator} ${claim_form_open_btn_locator} 153 click visible element and wait until page contains element ${claim_page_open_btn_locator} ${claim_form_open_btn_locator}
167 ${claim_form_resolved_input_locator} = replace string ${claim_form_resolved_input_locator_tpl} %complaint_id% ${complaintID} 154 ${claim_form_resolved_input_locator} = replace string ${claim_form_resolved_input_locator_tpl} %complaint_id% ${complaintID}
168 open popup by btn locator ${claim_form_resolved_input_locator} 155 open popup by btn locator ${claim_form_resolved_input_locator}
169 - Wait Until Page Contains ${popup_opened_content_success_locator} 60  
170 - wait until element is visible ${claim_form_complaintform_submit_btn_locator} 60  
171 -## wait until element is visible ${popup_opened_content_locator} 60  
172 ${value} = Set Variable If '${data.data.satisfied}' Задоволен Не задоволен 156 ${value} = Set Variable If '${data.data.satisfied}' Задоволен Не задоволен
173 run keyword and ignore error select from visible list by label ${claim_form_satisfied_input_locator} ${value} 157 run keyword and ignore error select from visible list by label ${claim_form_satisfied_input_locator} ${value}
174 capture page screenshot 158 capture page screenshot
@@ -187,9 +171,6 @@ get document complaint @@ -187,9 +171,6 @@ get document complaint
187 ${claim_form_open_form_answer_btn_locator} = replace string ${claim_form_open_form_answer_btn_locator_tpl} %title% ${complaintID} 171 ${claim_form_open_form_answer_btn_locator} = replace string ${claim_form_open_form_answer_btn_locator_tpl} %title% ${complaintID}
188 wait until page contains element with reloading ${claim_form_open_form_answer_btn_locator} 172 wait until page contains element with reloading ${claim_form_open_form_answer_btn_locator}
189 open popup by btn locator ${claim_form_open_form_answer_btn_locator} 173 open popup by btn locator ${claim_form_open_form_answer_btn_locator}
190 - Wait Until Page Contains ${popup_opened_content_success_locator} 60  
191 - wait until element is visible ${claim_form_answer_resolution_value_locator} 60  
192 -  
193 input text to exist visible input ${claim_form_answer_resolution_value_locator} ${answer_data.data.resolution} 174 input text to exist visible input ${claim_form_answer_resolution_value_locator} ${answer_data.data.resolution}
194 Run Keyword If '${answer_data.data.resolutionType}' == 'resolved' select from list by value ${claim_form_answer_resolution_type_value_locator} resolved 175 Run Keyword If '${answer_data.data.resolutionType}' == 'resolved' select from list by value ${claim_form_answer_resolution_type_value_locator} resolved
195 Run Keyword If '${answer_data.data.resolutionType}' == 'declined' select from list by value ${claim_form_answer_resolution_type_value_locator} declined 176 Run Keyword If '${answer_data.data.resolutionType}' == 'declined' select from list by value ${claim_form_answer_resolution_type_value_locator} declined
@@ -15,6 +15,8 @@ edit contract @@ -15,6 +15,8 @@ edit contract
15 Run Keyword If '${TEST_NAME}' == 'Неможливість вказати ціну договору з ПДВ більше ніж результат проведення аукціону' and '${mode}' not in 'open_esco' Fail Amount should be less or equal to awarded amount 15 Run Keyword If '${TEST_NAME}' == 'Неможливість вказати ціну договору з ПДВ більше ніж результат проведення аукціону' and '${mode}' not in 'open_esco' Fail Amount should be less or equal to awarded amount
16 Run Keyword If '${TEST_NAME}' == 'Неможливість вказати ціну договору з ПДВ більше ніж результат проведення аукціону' and '${mode}' in 'open_esco' Fail Can't update amount for contract value 16 Run Keyword If '${TEST_NAME}' == 'Неможливість вказати ціну договору з ПДВ більше ніж результат проведення аукціону' and '${mode}' in 'open_esco' Fail Can't update amount for contract value
17 Run Keyword If '${TEST_NAME}' == 'Неможливість зменшити ціну договору без ПДВ на суму більшу за 20% від ціни договору з ПДВ (закупівля з ПДВ)' Fail Amount should be greater than amountNet and differ by no more than 20.0% 17 Run Keyword If '${TEST_NAME}' == 'Неможливість зменшити ціну договору без ПДВ на суму більшу за 20% від ціни договору з ПДВ (закупівля з ПДВ)' Fail Amount should be greater than amountNet and differ by no more than 20.0%
  18 + ${complaint_period_end_date} = get value by locator on opened page ${tender_awards_complaintPeriod_endDate_value_locator}
  19 + Wait date ${complaint_period_end_date}
18 click visible element ${contract_form_0_open_btn_locator} 20 click visible element ${contract_form_0_open_btn_locator}
19 Run Keyword And Ignore Error Wait Until Page Contains ${contract_contractform_contract_number_input_locator} 10 21 Run Keyword And Ignore Error Wait Until Page Contains ${contract_contractform_contract_number_input_locator} 10
20 run keyword and ignore error wait until element is visible ${tender_status_active_qualification_value_locator} 5 22 run keyword and ignore error wait until element is visible ${tender_status_active_qualification_value_locator} 5
@@ -13,23 +13,18 @@ open tender form prequalification @@ -13,23 +13,18 @@ open tender form prequalification
13 [Documentation] Відкрити форму прекваліфікації і потрібну кваліфікацію під номером qualification_num 13 [Documentation] Відкрити форму прекваліфікації і потрібну кваліфікацію під номером qualification_num
14 14
15 run keyword if ${qualification_num} == 0 wait until page contains element with reloading ${prequalification_form_0_open_btn_locator} 15 run keyword if ${qualification_num} == 0 wait until page contains element with reloading ${prequalification_form_0_open_btn_locator}
16 - run keyword if ${qualification_num} == 0 click visible element ${prequalification_form_0_open_btn_locator}  
17 - run keyword if ${qualification_num} == 1 click visible element ${prequalification_form_1_open_btn_locator}  
18 - run keyword if ${qualification_num} == -1 click visible element ${prequalification_form_-1_open_btn_locator} 16 + run keyword if ${qualification_num} == 0 open popup by btn locator ${prequalification_form_0_open_btn_locator}
  17 + run keyword if ${qualification_num} == 1 open popup by btn locator ${prequalification_form_1_open_btn_locator}
  18 + run keyword if ${qualification_num} == -1 open popup by btn locator ${prequalification_form_-1_open_btn_locator}
19 run keyword if ${qualification_num} == -2 wait until page contains element with reloading ${prequalification_form_-2_open_btn_locator} 19 run keyword if ${qualification_num} == -2 wait until page contains element with reloading ${prequalification_form_-2_open_btn_locator}
20 - run keyword if ${qualification_num} == -2 click visible element ${prequalification_form_-2_open_btn_locator} 20 + run keyword if ${qualification_num} == -2 open popup by btn locator ${prequalification_form_-2_open_btn_locator}
21 # run keyword if ${qualification_num} == -2 execute javascript $('#bids-pjax .pseudo-table__row:last a[href*="/tender/prequalification"]').click() 21 # run keyword if ${qualification_num} == -2 execute javascript $('#bids-pjax .pseudo-table__row:last a[href*="/tender/prequalification"]').click()
22 22
23 confirm qualifications 23 confirm qualifications
24 [Documentation] Відкрити форму прекваліфікації і перевести кваліфікацію під номером qualification_num до тендера 24 [Documentation] Відкрити форму прекваліфікації і перевести кваліфікацію під номером qualification_num до тендера
25 ... tender_uaid в статус active. 25 ... tender_uaid в статус active.
26 26
27 - Wait Until Page Contains ${popup_opened_content_success_locator} 60  
28 - wait until element is visible ${qualification_form_submit_btn_locator} 60  
29 -# wait until popup is visible  
30 -# Execute Javascript ${qualification_form_accept_input_locator}  
31 Execute Javascript $('#prequalificationform-decision').val('accept').change() 27 Execute Javascript $('#prequalificationform-decision').val('accept').change()
32 -# select from visible list by label ${tender_form_award_organization_region_id_locator} ${region}  
33 capture page screenshot 28 capture page screenshot
34 wait until page contains element ${prequalification_form_eligible_input_locator} 29 wait until page contains element ${prequalification_form_eligible_input_locator}
35 capture page screenshot 30 capture page screenshot
@@ -41,13 +36,8 @@ reject qualifications @@ -41,13 +36,8 @@ reject qualifications
41 [Documentation] Відкрити форму прекваліфікації і перевестикваліфікацію під номером qualification_num до тендера 36 [Documentation] Відкрити форму прекваліфікації і перевестикваліфікацію під номером qualification_num до тендера
42 ... tender_uaid в статус unsuccessful. 37 ... tender_uaid в статус unsuccessful.
43 38
44 - Wait Until Page Contains ${popup_opened_content_success_locator} 60  
45 - wait until element is visible ${qualification_form_submit_btn_locator} 60  
46 -# wait until popup is visible  
47 -# Execute Javascript ${qualification_form_decline_input_locator}  
48 Execute Javascript $('#prequalificationform-decision').val('decline').change() 39 Execute Javascript $('#prequalificationform-decision').val('decline').change()
49 capture page screenshot 40 capture page screenshot
50 -# select from visible list by label ${tender_form_award_organization_region_id_locator} ${region}  
51 wait until page contains element ${qualification_form_reasons_cancellation_input_locator} 41 wait until page contains element ${qualification_form_reasons_cancellation_input_locator}
52 capture page screenshot 42 capture page screenshot
53 input text to exist visible input ${qualification_form_reasons_cancellation_input_locator} GenerateFakeText 43 input text to exist visible input ${qualification_form_reasons_cancellation_input_locator} GenerateFakeText
@@ -63,10 +53,6 @@ cancel qualifications @@ -63,10 +53,6 @@ cancel qualifications
63 [Documentation] Відкрити форму прекваліфікації і перевести кваліфікацію під номером qualification_num до тендера 53 [Documentation] Відкрити форму прекваліфікації і перевести кваліфікацію під номером qualification_num до тендера
64 ... tender_uaid в статус cancelled. 54 ... tender_uaid в статус cancelled.
65 55
66 - Wait Until Page Contains ${popup_opened_content_success_locator} 60  
67 - wait until element is visible ${qualification_form_submit_btn_locator} 60  
68 -# wait until popup is visible  
69 -# Execute Javascript ${qualification_form_cancel_input_locator}  
70 wait until page contains element ${prequalification_form_description_cancellation_input_locator} 56 wait until page contains element ${prequalification_form_description_cancellation_input_locator}
71 Execute Javascript $('#prequalificationform-decision').val('cancel').change() 57 Execute Javascript $('#prequalificationform-decision').val('cancel').change()
72 # select from visible list by label ${tender_form_award_organization_region_id_locator} ${region} 58 # select from visible list by label ${tender_form_award_organization_region_id_locator} ${region}
@@ -81,8 +67,6 @@ approve the final qualification decision @@ -81,8 +67,6 @@ approve the final qualification decision
81 [Documentation] Перевести тендер tender_uaid в статус active.pre-qualification.stand-still. 67 [Documentation] Перевести тендер tender_uaid в статус active.pre-qualification.stand-still.
82 68
83 wait until page contains ${qualification_form_approve_question_msg} 69 wait until page contains ${qualification_form_approve_question_msg}
84 -# click visible element ${qualification_form_description_cancellation_input_locator}  
85 -## submit form and check result ${qualification_form_approve_submit_btn_locator} ${qualification_form_approve_success_msg} ${tender_created_checker_element_locator}  
86 Execute Javascript ${qualification_form_approve_js_submit_btn_locator} 70 Execute Javascript ${qualification_form_approve_js_submit_btn_locator}
87 Wait Until Page Contains ${qualification_form_approve_success_msg} 60 71 Wait Until Page Contains ${qualification_form_approve_success_msg} 60
88 wait until alert is visible ${qualification_form_approve_success_msg} 72 wait until alert is visible ${qualification_form_approve_success_msg}
@@ -96,17 +80,18 @@ open tender form qualification @@ -96,17 +80,18 @@ open tender form qualification
96 80
97 run keyword if "${mode}" not in "open_framework" Run Keywords 81 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} 82 ... 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} 83 + ... AND run keyword if ${award_num} == 0 open popup by btn locator ${qualification_form_0_open_btn_locator}
100 ##### BOF - TMP ##### 84 ##### BOF - TMP #####
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} 85 + ... AND run keyword if ${award_num} == 1 open popup by btn locator ${qualification_form_0_open_btn_locator}
  86 + ... AND run keyword if ${award_num} == -1 open popup by btn locator ${qualification_form_last_open_btn_locator}
  87 + ... AND run keyword if ${award_num} == 2 open popup by btn locator ${qualification_form_0_open_btn_locator}
103 ... ELSE IF "${mode}" in "open_framework" Run Keywords 88 ... 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} 89 ... 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 - ... AND run keyword if ${award_num} == 1 click visible element ${qualification_form_1_open_btn_locator}  
107 - ... AND run keyword if ${award_num} == -1 click visible element ${qualification_form_last_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} 90 + ... AND run keyword if ${award_num} == 0 open popup by btn locator ${qualification_form_0_open_btn_locator}
  91 + ... AND run keyword if ${award_num} == 1 open popup by btn locator ${qualification_form_1_open_btn_locator}
  92 + ... AND run keyword if ${award_num} == -1 open popup by btn locator ${qualification_form_last_open_btn_locator}
  93 + ... AND run keyword if ${award_num} == 2 open popup by btn locator ${qualification_form_2_open_btn_locator}
  94 + ... AND run keyword if ${award_num} == 3 open popup by btn locator ${qualification_form_3_open_btn_locator}
110 95
111 copy file qualification 96 copy file qualification
112 [Arguments] ${username} ${document} ${award_num} 97 [Arguments] ${username} ${document} ${award_num}
@@ -123,7 +108,6 @@ confirm award qualification @@ -123,7 +108,6 @@ confirm award qualification
123 [Documentation] Перевести постачальника під номером award_num для тендера tender_uaid 108 [Documentation] Перевести постачальника під номером award_num для тендера tender_uaid
124 ... в статус active. 109 ... в статус active.
125 110
126 -# wait until popup is visible  
127 Wait Until Page Contains ${popup_opened_content_success_locator} 60 111 Wait Until Page Contains ${popup_opened_content_success_locator} 60
128 run keyword and ignore error wait until element is visible ${tender_status_active_qualification_value_locator} 10 112 run keyword and ignore error wait until element is visible ${tender_status_active_qualification_value_locator} 10
129 wait until element is visible ${qualification_form_submit_btn_locator} 60 113 wait until element is visible ${qualification_form_submit_btn_locator} 60
@@ -487,14 +487,12 @@ Wait For contractactive @@ -487,14 +487,12 @@ Wait For contractactive
487 Отримати інформацію із awards.complaintPeriod.endDate 487 Отримати інформацію із awards.complaintPeriod.endDate
488 [Documentation] Отримати значення поля awards.complaintPeriod.endDate 488 [Documentation] Отримати значення поля awards.complaintPeriod.endDate
489 489
490 -# run keyword and ignore error run keyword if '${mode}' in 'belowThreshold below_funders' Wait Until Keyword Succeeds 600 s 30 s Wait For complaintPeriodendDate  
491 run keyword and ignore error Wait Until Keyword Succeeds 600 s 30 s Wait For complaintPeriodendDate 490 run keyword and ignore error Wait Until Keyword Succeeds 600 s 30 s Wait For complaintPeriodendDate
492 -# run keyword and ignore error click visible element ${contract_form_0_open_btn_locator}  
493 -# wait until element is visible ${tender_awards_complaintPeriod_endDate_value_locator} 60  
494 - ${return_value} = run keyword if '${mode}' in 'negotiation' get value by locator on opened page ${tender_awards_negotiation_complaintPeriod_endDate_value_locator}  
495 - ... ELSE get value by locator on opened page ${tender_awards_complaintPeriod_endDate_value_locator}  
496 - ${return_value} = run keyword if '${mode}' in 'negotiation' parse_complaintPeriod_date ${return_value}  
497 - ... ELSE set variable ${return_value} 491 + ${return_value} = get value by locator on opened page ${tender_awards_complaintPeriod_endDate_value_locator}
  492 +# ${return_value} = run keyword if '${mode}' in 'negotiation' get value by locator on opened page ${tender_awards_negotiation_complaintPeriod_endDate_value_locator}
  493 +# ... ELSE get value by locator on opened page ${tender_awards_complaintPeriod_endDate_value_locator}
  494 +# ${return_value} = run keyword if '${mode}' in 'negotiation' parse_complaintPeriod_date ${return_value}
  495 +# ... ELSE set variable ${return_value}
498 [return] ${return_value} 496 [return] ${return_value}
499 497
500 Отримати інформацію із complaintPeriod.endDate 498 Отримати інформацію із complaintPeriod.endDate
@@ -552,5 +550,10 @@ wait for agreements status active @@ -552,5 +550,10 @@ wait for agreements status active
552 ${return_value} = get value by locator on opened page ${tender_agreements_0_status_value_locator} 550 ${return_value} = get value by locator on opened page ${tender_agreements_0_status_value_locator}
553 Page Should Contain Element ${tender_agreements_status_active_value_locator} 551 Page Should Contain Element ${tender_agreements_status_active_value_locator}
554 552
  553 +Wait date
  554 + [Arguments] ${date}
  555 + ${sleep}= wait_to_date ${date}
  556 + Run Keyword If ${sleep} > 0 Sleep ${sleep}
  557 +
555 558
556 559
Please register or login to post a comment