Administrator / playtender-robot_tests · Commits

Commit 1d385ade851b2e7bbfccacb1cea735976a08a4af

Authored by Playtenders
1 parent 34d53143
build: skipped

next

Inline Side-by-side
Showing 2 changed files with 12 additions and 15 deletions
@@ -733,7 +733,6 @@ Wait For Sync Tender Finish @@ -733,7 +733,6 @@ Wait For Sync Tender Finish
733 Додати постачальника For Reporting 733 Додати постачальника For Reporting
734 [Arguments] ${budget} ${data} 734 [Arguments] ${budget} ${data}
735 ${wrapper}= Set Variable \#collapseAward 735 ${wrapper}= Set Variable \#collapseAward
736 - ${budget}= Convert To String ${budget}  
737 736
738 JsSetScrollToElementBySelector \#collapseAward 737 JsSetScrollToElementBySelector \#collapseAward
739 Click Element jquery=.panel-title a[data-toggle="collapse"][href="#collapseAward"] 738 Click Element jquery=.panel-title a[data-toggle="collapse"][href="#collapseAward"]
@@ -750,8 +749,8 @@ Wait For Sync Tender Finish @@ -750,8 +749,8 @@ Wait For Sync Tender Finish
750 Input Text jquery=${wrapper} \#tenderreportingform-award_organization_contact_point_name ${data.contactPoint.name} 749 Input Text jquery=${wrapper} \#tenderreportingform-award_organization_contact_point_name ${data.contactPoint.name}
751 Input Text jquery=${wrapper} \#tenderreportingform-award_organization_contact_point_email ${data.contactPoint.email} 750 Input Text jquery=${wrapper} \#tenderreportingform-award_organization_contact_point_email ${data.contactPoint.email}
752 Input Text jquery=${wrapper} \#tenderreportingform-award_organization_contact_point_phone ${data.contactPoint.telephone} 751 Input Text jquery=${wrapper} \#tenderreportingform-award_organization_contact_point_phone ${data.contactPoint.telephone}
753 - Input Text jquery=${wrapper} \#tenderreportingform-award_value_amount ${budget}  
754 - 752 + Input Float ${wrapper} \#tenderreportingform-award_value_amount ${budget}
  753 +
755 Додати постачальника For Reporting Fake 754 Додати постачальника For Reporting Fake
756 ${identifier} Create Dictionary id=1234567890 755 ${identifier} Create Dictionary id=1234567890
757 ${address} Create Dictionary region=місто Київ postalCode=123 locality=Київ streetAddress=address 756 ${address} Create Dictionary region=місто Київ postalCode=123 locality=Київ streetAddress=address
@@ -915,7 +914,7 @@ Wait For Sync Tender Finish @@ -915,7 +914,7 @@ Wait For Sync Tender Finish
915 [Arguments] ${field} ${value} 914 [Arguments] ${field} ${value}
916 915
917 JsSetScrollToElementBySelector \#contractform-contract_number 916 JsSetScrollToElementBySelector \#contractform-contract_number
918 - Run Keyword If '${field}' == 'value.amount' Input Text id=contractform-value_amount ${value} 917 + Run Keyword If '${field}' == 'value.amount' Input Float \#contractform-value_amount ${value}
919 Run Keyword If '${field}' == 'dateSigned' Input DateTime \#contractform-date_signed ${value} 918 Run Keyword If '${field}' == 'dateSigned' Input DateTime \#contractform-date_signed ${value}
920 Run Keyword If '${field}' == 'period.startDate' Input DateTime \#contractform-date_start ${value} 919 Run Keyword If '${field}' == 'period.startDate' Input DateTime \#contractform-date_start ${value}
921 Run Keyword If '${field}' == 'period.endDate' Input DateTime \#contractform-date_end ${value} 920 Run Keyword If '${field}' == 'period.endDate' Input DateTime \#contractform-date_end ${value}
@@ -1308,7 +1307,7 @@ Save Tender @@ -1308,7 +1307,7 @@ Save Tender
1308 Click Element xpath=//button[contains(text(), 'Надати відповідь')] 1307 Click Element xpath=//button[contains(text(), 'Надати відповідь')]
1309 Sleep 1 1308 Sleep 1
1310 Click Element xpath=//div[contains(@class, 'jconfirm')]//button[contains(text(), 'Закрити')] 1309 Click Element xpath=//div[contains(@class, 'jconfirm')]//button[contains(text(), 'Закрити')]
1311 - Sleep 2 1310 + Sleep 20
1312 1311
1313 Відповісти на вимогу 1312 Відповісти на вимогу
1314 [Arguments] ${username} ${tender_uaid} ${claim_id} ${answer} ${award_index} 1313 [Arguments] ${username} ${tender_uaid} ${claim_id} ${answer} ${award_index}
@@ -2248,9 +2247,9 @@ Save Proposal @@ -2248,9 +2247,9 @@ Save Proposal
2248 ### BOF - Esco ### 2247 ### BOF - Esco ###
2249 Run Keyword If '${arguments[2]}' == 'awards[4].complaintPeriod.endDate' JsOpenAwardByIndex 4 2248 Run Keyword If '${arguments[2]}' == 'awards[4].complaintPeriod.endDate' JsOpenAwardByIndex 4
2250 Run Keyword And Return If '${arguments[2]}' == 'awards[4].complaintPeriod.endDate' get_invisible_text jquery=.award-list-wrapper:first .panel-collapse.in .complaint-period-end-date.hidden 2249 Run Keyword And Return If '${arguments[2]}' == 'awards[4].complaintPeriod.endDate' get_invisible_text jquery=.award-list-wrapper:first .panel-collapse.in .complaint-period-end-date.hidden
2251 - Run Keyword And Return If '${arguments[2]}' == 'minimalStepPercentage' get_invisible_text jquery=#tender-general-info > p.minimal-step-percentage-source.hidden  
2252 - Run Keyword And Return If '${arguments[2]}' == 'yearlyPaymentsPercentageRange' get_invisible_text jquery=#tender-general-info > p.yearly-payments-percentage-range-source.hidden  
2253 - Run Keyword And Return If '${arguments[2]}' == 'fundingKind' get_invisible_text jquery=#tender-general-info > p.funding-kind-source.hidden 2250 + Run Keyword And Return If '${arguments[2]}' == 'minimalStepPercentage' get_invisible_text jquery=#tender-general-info .minimal-step-percentage-source.hidden
  2251 + Run Keyword And Return If '${arguments[2]}' == 'yearlyPaymentsPercentageRange' get_invisible_text jquery=#tender-general-info .yearly-payments-percentage-range-source.hidden
  2252 + Run Keyword And Return If '${arguments[2]}' == 'fundingKind' get_invisible_text jquery=#tender-general-info .funding-kind-source.hidden
2254 ### EOF - Esco ### 2253 ### EOF - Esco ###
2255 2254
2256 Fail Потрібна реалізація в "Отримати інформацію із тендера" 2255 Fail Потрібна реалізація в "Отримати інформацію із тендера"
@@ -2281,7 +2280,7 @@ Save Proposal @@ -2281,7 +2280,7 @@ Save Proposal
2281 Run Keyword And Return If 'minimalStep.valueAddedTaxIncluded' == '${arguments[2]}' Отримати інформацію із лоту minimalStep.valueAddedTaxIncluded ${arguments[1]} 2280 Run Keyword And Return If 'minimalStep.valueAddedTaxIncluded' == '${arguments[2]}' Отримати інформацію із лоту minimalStep.valueAddedTaxIncluded ${arguments[1]}
2282 Run Keyword And Return If 'auctionPeriod.startDate' == '${arguments[2]}' get_invisible_text jquery=#accordionLots .panel-collapse.in .lot-info-wrapper .auction-period-start-date.hidden 2281 Run Keyword And Return If 'auctionPeriod.startDate' == '${arguments[2]}' get_invisible_text jquery=#accordionLots .panel-collapse.in .lot-info-wrapper .auction-period-start-date.hidden
2283 Run Keyword And Return If 'auctionPeriod.endDate' == '${arguments[2]}' get_invisible_text jquery=#accordionLots .panel-collapse.in .lot-info-wrapper .auction-period-end-date.hidden 2282 Run Keyword And Return If 'auctionPeriod.endDate' == '${arguments[2]}' get_invisible_text jquery=#accordionLots .panel-collapse.in .lot-info-wrapper .auction-period-end-date.hidden
2284 - Run Keyword And Return If 'minimalStepPercentage' == '${arguments[2]}' Get invisible text number by locator jquery=#accordionLots .lot-info-wrapper:first .minimal-step-percentage-source.hidden 2283 + Run Keyword And Return If 'minimalStepPercentage' == '${arguments[2]}' Get invisible text number by locator jquery=#accordionLots .panel-collapse.in .lot-info-wrapper .minimal-step-percentage-source.hidden
2285 Run Keyword And Return If 'fundingKind' == '${arguments[2]}' get_invisible_text jquery=#accordionLots .lot-info-wrapper:first .funding-kind-source.hidden 2284 Run Keyword And Return If 'fundingKind' == '${arguments[2]}' get_invisible_text jquery=#accordionLots .lot-info-wrapper:first .funding-kind-source.hidden
2286 Run Keyword And Return If 'yearlyPaymentsPercentageRange' == '${arguments[2]}' Get invisible text number by locator jquery=#accordionLots .lot-info-wrapper:first .yearly-payments-percentage-range-source.hidden 2285 Run Keyword And Return If 'yearlyPaymentsPercentageRange' == '${arguments[2]}' Get invisible text number by locator jquery=#accordionLots .lot-info-wrapper:first .yearly-payments-percentage-range-source.hidden
2287 2286
@@ -3173,7 +3172,6 @@ Switch To Complaints @@ -3173,7 +3172,6 @@ Switch To Complaints
3173 ${data}= Get From Dictionary ${plan_data} data 3172 ${data}= Get From Dictionary ${plan_data} data
3174 ${data_keys}= Get Dictionary Keys ${data} 3173 ${data_keys}= Get Dictionary Keys ${data}
3175 ${start_date}= convert_isodate_to_site_date ${data.tender.tenderPeriod.startDate} 3174 ${start_date}= convert_isodate_to_site_date ${data.tender.tenderPeriod.startDate}
3176 - ${budget_keys}= Get Dictionary Keys ${data.budget}  
3177 ${budget_amount}= Convert To String ${data.budget.amount} 3175 ${budget_amount}= Convert To String ${data.budget.amount}
3178 ${classificationWrapper}= Set Variable \#collapseGeneral 3176 ${classificationWrapper}= Set Variable \#collapseGeneral
3179 ${itemsWrapper}= Set Variable a[href='#collapseItems'] 3177 ${itemsWrapper}= Set Variable a[href='#collapseItems']
@@ -3192,7 +3190,7 @@ Switch To Complaints @@ -3192,7 +3190,7 @@ Switch To Complaints
3192 Run Keyword If 'period' in ${budget_keys} input datetime \#planform-period_end_date ${data.budget.period.endDate} 3190 Run Keyword If 'period' in ${budget_keys} input datetime \#planform-period_end_date ${data.budget.period.endDate}
3193 JsInputHiddenText \#planform-budget_id ${data.budget.id} 3191 JsInputHiddenText \#planform-budget_id ${data.budget.id}
3194 Input text id=planform-title ${data.budget.description} 3192 Input text id=planform-title ${data.budget.description}
3195 - Input text id=planform-value_amount ${budget_amount} 3193 + Input Float \#planform-value_amount ${data.budget.amount}
3196 Select From List By Value id=planform-value_currency ${data.budget.currency} 3194 Select From List By Value id=planform-value_currency ${data.budget.currency}
3197 JsInputHiddenText \#planform-project_id ${data.budget.project.id} 3195 JsInputHiddenText \#planform-project_id ${data.budget.project.id}
3198 JsInputHiddenText \#planform-project_name ${data.budget.project.name} 3196 JsInputHiddenText \#planform-project_name ${data.budget.project.name}
@@ -3524,7 +3522,7 @@ GetTenderAuctionEndStatus @@ -3524,7 +3522,7 @@ GetTenderAuctionEndStatus
3524 3522
3525 Input Float 3523 Input Float
3526 [Arguments] ${input_jquery_selector} ${value} 3524 [Arguments] ${input_jquery_selector} ${value}
3527 - ${value}= Convert To String ${value} 3525 + ${value}= convert_float_to_string ${value}
3528 Input Text jquery=${input_jquery_selector} ${value} 3526 Input Text jquery=${input_jquery_selector} ${value}
3529 3527
3530 Input Float Multiply100 3528 Input Float Multiply100
@@ -5,7 +5,6 @@ from robot.libraries.BuiltIn import BuiltIn @@ -5,7 +5,6 @@ from robot.libraries.BuiltIn import BuiltIn
5 from robot.output import librarylogger 5 from robot.output import librarylogger
6 import urllib 6 import urllib
7 import urllib3 7 import urllib3
8 -#import decimal  
9 8
10 def get_library(): 9 def get_library():
11 return BuiltIn().get_library_instance('Selenium2Library') 10 return BuiltIn().get_library_instance('Selenium2Library')
@@ -103,8 +102,8 @@ def get_text_excluding_children(locator): @@ -103,8 +102,8 @@ def get_text_excluding_children(locator):
103 return text.strip() 102 return text.strip()
104 103
105 def convert_float_to_string(number): 104 def convert_float_to_string(number):
106 - return format(number, '.2f')  
107 - 105 + return repr(number);
  106 +
108 def convert_date_for_compare_ex(datestr): 107 def convert_date_for_compare_ex(datestr):
109 return datetime.strptime(datestr, "%d.%m.%Y %H:%M").strftime("%Y-%m-%d %H:%M+02:00") 108 return datetime.strptime(datestr, "%d.%m.%Y %H:%M").strftime("%Y-%m-%d %H:%M+02:00")
110 109
Please register or login to post a comment