Showing
1 changed file
with
20 additions
and
12 deletions
playtender.robot
100755 → 100644
@@ -939,14 +939,18 @@ Load Sign | @@ -939,14 +939,18 @@ Load Sign | ||
939 | Sleep 5 | 939 | Sleep 5 |
940 | 940 | ||
941 | Load Sign Data | 941 | Load Sign Data |
942 | - Wait Until Page Contains Element id=CAsServersSelect 60 | ||
943 | - Select From List By Label id=CAsServersSelect Тестовий ЦСК АТ "ІІТ" | ||
944 | - Wait Until Page Contains Element id=PKeyFileInput 10 | ||
945 | - Choose File id=PKeyFileInput ${CURDIR}/Key-6.dat | ||
946 | - Wait Until Page Contains Element id=PKeyPassword 10 | ||
947 | - Input Text id=PKeyPassword 12345677 | ||
948 | - Wait Until Page Contains Element id=PKeyReadButton 10 | ||
949 | - Click Element id=PKeyReadButton | 942 | + Sleep 60 |
943 | + ${sugn_type_status}= Run Keyword And Return Status Element Should Be Visible id=CAsServersSelect | ||
944 | + Run Keyword If ${sugn_type_status} Run Keywords | ||
945 | + ... Wait Until Page Contains Element id=CAsServersSelect 60 | ||
946 | + ... AND Select From List By Label id=CAsServersSelect Тестовий ЦСК АТ "ІІТ" | ||
947 | + ... AND Wait Until Page Contains Element id=PKeyFileInput 10 | ||
948 | + ... AND Choose File id=PKeyFileInput ${CURDIR}/Key-6.dat | ||
949 | + ... AND Wait Until Page Contains Element id=PKeyPassword 10 | ||
950 | + ... AND Input Text id=PKeyPassword 12345677 | ||
951 | + ... AND Wait Until Page Contains Element id=PKeyReadButton 10 | ||
952 | + ... AND Click Element id=PKeyReadButton | ||
953 | + ... ELSE Load Sign Data | ||
950 | 954 | ||
951 | Wait user action | 955 | Wait user action |
952 | [Arguments] @{ARGUMENTS} | 956 | [Arguments] @{ARGUMENTS} |
@@ -3271,10 +3275,14 @@ UserChangeOrgnizationInfo | @@ -3271,10 +3275,14 @@ UserChangeOrgnizationInfo | ||
3271 | Input text id=profileform-organization_name ${data.name} | 3275 | Input text id=profileform-organization_name ${data.name} |
3272 | Input text id=profileform-organization_edrpou ${data.identifier.id} | 3276 | Input text id=profileform-organization_edrpou ${data.identifier.id} |
3273 | JsSetScrollToElementBySelector \#profileform-organization_region_id | 3277 | JsSetScrollToElementBySelector \#profileform-organization_region_id |
3274 | - Select From List By Label jquery=#profileform-organization_region_id ${data.address.region} | ||
3275 | - Input Text jquery=#profileform-organization_postal_code ${data.address.postalCode} | ||
3276 | - Input Text jquery=#profileform-organization_locality ${data.address.locality} | ||
3277 | - Input Text jquery=#profileform-organization_street_address ${data.address.streetAddress} | 3278 | + ${is_address.region}= Run Keyword And Return Status Dictionary Should Contain Key ${data} address.region |
3279 | + Run Keyword If ${is_address.region} Select From List By Label jquery=#profileform-organization_region_id ${data.address.region} | ||
3280 | + ${is_address.postalCode}= Run Keyword And Return Status Dictionary Should Contain Key ${data} address.postalCode | ||
3281 | + Run Keyword If ${is_address.postalCode} Input Text jquery=#profileform-organization_postal_code ${data.address.postalCode} | ||
3282 | + ${is_address.locality}= Run Keyword And Return Status Dictionary Should Contain Key ${data} address.locality | ||
3283 | + Run Keyword If ${is_address.locality} Input Text jquery=#profileform-organization_locality ${data.address.locality} | ||
3284 | + ${is_address.streetAddress}= Run Keyword And Return Status Dictionary Should Contain Key ${data} address.streetAddress | ||
3285 | + Run Keyword If ${is_address.streetAddress} Input Text jquery=#profileform-organization_street_address ${data.address.streetAddress} | ||
3278 | 3286 | ||
3279 | JsSetScrollToElementBySelector \#user-profile-form .js-submit-btn | 3287 | JsSetScrollToElementBySelector \#user-profile-form .js-submit-btn |
3280 | Click Element jquery=\#user-profile-form .js-submit-btn | 3288 | Click Element jquery=\#user-profile-form .js-submit-btn |
Please
register
or
login
to post a comment