From ea6ff33a3e47deadb26037925e5e798178f6379f Mon Sep 17 00:00:00 2001 From: byb11 Date: Mon, 26 Apr 2021 10:45:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4Ui=E8=87=AA=E5=8A=A8=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tsg_ui/ui_administration/MyAccountCase.robot | 16 ++++++++-------- .../ui_settings/DecryptionKeyringsCase.robot | 2 +- 02-Keyword/tsg_ui/setting/Settings.robot | 3 ++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/01-TestCase/tsg_ui/ui_administration/MyAccountCase.robot b/01-TestCase/tsg_ui/ui_administration/MyAccountCase.robot index c1751b8..1e96062 100644 --- a/01-TestCase/tsg_ui/ui_administration/MyAccountCase.robot +++ b/01-TestCase/tsg_ui/ui_administration/MyAccountCase.robot @@ -8,7 +8,7 @@ MyAccountEditClose [Tags] Positive UI Administration My Account OpenMyAccountPage EditMyAccount ${TEST NAME} 1111111 1111111 close - Wait Until Element Is Enabled xpath=/html/body/div[last()]/p ${sleep_Wait} + Wait Until Element Is Enabled xpath=//*[@id="app"]/following-sibling::div/p ${sleep_Wait} OpenMyAccountPage EditMyAccount ${username} ${password} ${password} close @@ -16,7 +16,7 @@ MyAccountEditOpen [Tags] Positive UI Administration My Account OpenMyAccountPage EditMyAccount ${TEST NAME} 1111111 1111111 Open - Wait Until Element Is Enabled xpath=/html/body/div[last()]/p ${sleep_Wait} + Wait Until Element Is Enabled xpath=//*[@id="app"]/following-sibling::div/p ${sleep_Wait} OpenMyAccountPage EditMyAccount ${username} ${password} ${password} close @@ -24,7 +24,7 @@ MyAccountEditNameMinSize [Tags] Boundary UI Administration My Account OpenMyAccountPage EditMyAccount 1 1111111 1111111 close - Wait Until Element Is Enabled xpath=/html/body/div[last()]/p ${sleep_Wait} + Wait Until Element Is Enabled xpath=//*[@id="app"]/following-sibling::div/p ${sleep_Wait} OpenMyAccountPage EditMyAccount ${username} ${password} ${password} close @@ -32,7 +32,7 @@ MyAccountEditNameMaxSize [Tags] Boundary UI Administration My Account OpenMyAccountPage EditMyAccount MyAccountEditNameMaxSizeMyAccoun 1111111 1111111 close - Wait Until Element Is Enabled xpath=/html/body/div[last()]/p ${sleep_Wait} + Wait Until Element Is Enabled xpath=//*[@id="app"]/following-sibling::div/p ${sleep_Wait} OpenMyAccountPage EditMyAccount ${username} ${password} ${password} close @@ -40,7 +40,7 @@ MyAccountEditNameSpecialChar [Tags] Boundary UI Administration My Account OpenMyAccountPage EditMyAccount 中文+absc+моряков+@#￥%……&* 1111111 1111111 close - Wait Until Element Is Enabled xpath=/html/body/div[last()]/p ${sleep_Wait} + Wait Until Element Is Enabled xpath=//*[@id="app"]/following-sibling::div/p ${sleep_Wait} OpenMyAccountPage EditMyAccount ${username} ${password} ${password} close @@ -48,7 +48,7 @@ MyAccountEditDayMinimum [Tags] Boundary UI Administration My Account OpenMyAccountPage EditMyAccount ${username} 1111111 1111111 open 1 - Wait Until Element Is Enabled xpath=/html/body/div[last()]/p ${sleep_Wait} + Wait Until Element Is Enabled xpath=//*[@id="app"]/following-sibling::div/p ${sleep_Wait} OpenMyAccountPage EditMyAccount ${username} ${password} ${password} close @@ -56,7 +56,7 @@ MyAccountEditDayMax [Tags] Boundary UI Administration My Account OpenMyAccountPage EditMyAccount ${username} 1111111 1111111 open 2147483647 - Wait Until Element Is Enabled xpath=/html/body/div[last()]/p ${sleep_Wait} + Wait Until Element Is Enabled xpath=//*[@id="app"]/following-sibling::div/p ${sleep_Wait} OpenMyAccountPage EditMyAccount ${username} ${password} ${password} close @@ -71,7 +71,7 @@ MyAccountPasswordNotModified OpenMyAccountPage EditMyAccount ${username} ${password} ${password} Wait Until Element Is Enabled xpath=//*[@id="app"]/following-sibling::div/p ${sleep_Wait} - Assertion /html/body/div[last()]/p The password setting cannot be the same as the previous one. + Assertion //*[@id="app"]/following-sibling::div/p The password setting cannot be the same as the previous one. MyAccountTwoPasswordsAreInconsistent [Tags] Negtive UI Administration My Account diff --git a/01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot b/01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot index 73ace4c..d6eab77 100644 --- a/01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot +++ b/01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot @@ -182,7 +182,7 @@ DecryptionKeyringsTypeSortButton [Tags] Positive UI Settings DecryptionKeyrings OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[2] xpath SortButton //*[@id="ly-table1-listcontent"]/div/div[2]/table/thead/tr/th[3]/div/span/i Decryption Keyrings - + DecryptionKeyringsExpiryDateSortButton [Tags] Positive UI Settings DecryptionKeyrings OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[2] xpath diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot index 28044b5..e7c8e2b 100644 --- a/02-Keyword/tsg_ui/setting/Settings.robot +++ b/02-Keyword/tsg_ui/setting/Settings.robot @@ -766,6 +766,7 @@ DecryptionKeyringsErrorVerification sleep ${sleep_min} click id=keyringsadd_sub #点击OK缇交 Wait Until Element Is Enabled xpath=${Positioning} ${sleep_Wait} + sleep ${sleep} ${text1} Get Text xpath=${Positioning} #获取点击后页面文本信息 Should Be Equal As Strings ${text1} ${Assertion} #断言 @@ -2614,7 +2615,7 @@ SortButton ${One} Set Variable [1] ${Two} Set Variable [2] ${assert} Set Variable if "${page}" == "Trusted Certificate Authorities" //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span - ... "${page}" == "Decryption Keyrings" //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span + ... "${page}" == "Decryption Keyrings" //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[3]/td[1]/div/div/div/p/span ... "${page}" == "Cached Intermediate Certificates" //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span sleep ${sleep_min} ${text1} get text xpath=${assert}