diff --git a/01-TestCase/tsg_ui/ui_administration/MyAccountCase.robot b/01-TestCase/tsg_ui/ui_administration/MyAccountCase.robot index ca4937e..5e5c55d 100644 --- a/01-TestCase/tsg_ui/ui_administration/MyAccountCase.robot +++ b/01-TestCase/tsg_ui/ui_administration/MyAccountCase.robot @@ -64,7 +64,7 @@ MyAccountEditDayExceedMax [Tags] Negtive UI Administration My Account OpenMyAccountPage EditMyAccount ${username} 1111111 1111111 open 2147483648 - Assertion //*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[6]/div/div[2] Cannot be 0, exceed maximum 2147483647, and be empty + Assertion /html/body/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[6]/div/div[2] Cannot be 0, exceed maximum 2147483647, and be empty MyAccountPasswordNotModified [Tags] Negtive UI Administration My Account @@ -77,5 +77,5 @@ MyAccountTwoPasswordsAreInconsistent [Tags] Negtive UI Administration My Account OpenMyAccountPage EditMyAccount ${username} 111 111111111 - Assertion //*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[4]/div/div[2] The two passwords are inconsistent + Assertion /html/body/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[4]/div/div[2] The two passwords are inconsistent diff --git a/01-TestCase/tsg_ui/ui_settings/CachedIntermediateCertificatesCase.robot b/01-TestCase/tsg_ui/ui_settings/CachedIntermediateCertificatesCase.robot index 19c3592..a04ac1a 100644 --- a/01-TestCase/tsg_ui/ui_settings/CachedIntermediateCertificatesCase.robot +++ b/01-TestCase/tsg_ui/ui_settings/CachedIntermediateCertificatesCase.robot @@ -102,28 +102,28 @@ CachedIntermediateCertificatesCreateTimeSortButton OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[4] xpath SortButton //*[@id="ly-table1-listcontent"]/div/div[2]/table/thead/tr/th[12]/div/span/i Cached Intermediate Certificates -CachedIntermediateCertificatesImportExpiredCertificate #导入过期证书 - [Tags] Positive UI Settings CachedIntermediateCertificates - OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[4] xpath - ${text1} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span - Open Connection 192.168.44.11 port=22 - Login root *#00#QAZxsw@edc - Write cd /home/byb/ - Write ./1111.sh - sleep ${sleep} - ${text2} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span - Should Be Equal As Strings ${text1} ${text2} +# CachedIntermediateCertificatesImportExpiredCertificate #导入过期证书 + # [Tags] Positive UI Settings CachedIntermediateCertificates + # OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[4] xpath + # ${text1} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span + # Open Connection 192.168.44.11 port=22 + # Login root *#00#QAZxsw@edc + # Write cd /home/byb/ + # Write ./1111.sh + # sleep ${sleep} + # ${text2} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span + # Should Be Equal As Strings ${text1} ${text2} -CachedIntermediateCertificatesSynchronizeVerification #验证修改证书状态 rides是否同步 - [Tags] Positive UI Settings CachedIntermediateCertificates - OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[4] xpath - Settings-Search 1 id - click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[10]/div/div/div/span - sleep 3 - Open Connection ${host} port=22 - Login root Xxg-PUB<>90 - ${Results} Execute Command redis-cli -h ${host} -p 7002 keys EFF*PXY_EXCH_INTERMEDIA_CERT,1 - sleep ${sleep_min} - Should Not Be Equal ${Results} EFFECTIVE_RULE:PXY_EXCH_INTERMEDIA_CERT,1 - click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[10]/div/div/div/span +# CachedIntermediateCertificatesSynchronizeVerification #验证修改证书状态 rides是否同步 + # [Tags] Positive UI Settings CachedIntermediateCertificates + # OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[4] xpath + # Settings-Search 1 id + # click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[10]/div/div/div/span + # sleep 3 + # Open Connection ${host} port=22 + # Login root Xxg-PUB<>90 + # ${Results} Execute Command redis-cli -h ${host} -p 7002 keys EFF*PXY_EXCH_INTERMEDIA_CERT,1 + # sleep ${sleep_min} + # Should Not Be Equal ${Results} EFFECTIVE_RULE:PXY_EXCH_INTERMEDIA_CERT,1 + # click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[10]/div/div/div/span \ No newline at end of file diff --git a/02-Keyword/tsg_ui/administration/Administration.robot b/02-Keyword/tsg_ui/administration/Administration.robot index 21d4d41..94abc2d 100644 --- a/02-Keyword/tsg_ui/administration/Administration.robot +++ b/02-Keyword/tsg_ui/administration/Administration.robot @@ -472,19 +472,19 @@ EditMyAccount [Documentation] ... sleep ${sleep_min} - input text xpath=//*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[1]/div/div[1]/input ${name} + input text id=undefined1 ${name} sleep ${sleep_min} - input text xpath=//*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[3]/div/div/input ${password} + input text xpath=/html/body/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[3]/div/div/input ${password} sleep ${sleep_min} - input text xpath=//*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[4]/div/div/input ${ConfirmPassword} + input text xpath=/html/body/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[4]/div/div/input ${ConfirmPassword} sleep ${sleep_min} - ${status} Get Element Attribute xpath=//*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[5]/div/div class + ${status} Get Element Attribute xpath=/html/body/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[5]/div/div class run keyword if "${RequiredPasswordChange}"=="open" and "${status}"=="el-switch" run keywords sleep ${sleep_min} - ... AND click element xpath=//*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[5]/div/div/span + ... AND click element xpath=/html/body/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[5]/div/div/span ... AND sleep ${sleep_min} - ... AND input text xpath=//*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[6]/div/div/input ${Day} + ... AND input text xpath=/html/body/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[6]/div/div/input ${Day} run keyword if "${RequiredPasswordChange}"=="close" and "${status}"=="el-switch is-checked" run keywords sleep ${sleep_min} - ... AND click element xpath=//*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[5]/div/div/span + ... AND click element xpath=/html/body/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[5]/div/div/span ... ELSE log 不修改密码提醒按钮 sleep ${sleep_min} click element id=userOk diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot index 2d95e4b..3543cba 100644 --- a/02-Keyword/tsg_ui/setting/Settings.robot +++ b/02-Keyword/tsg_ui/setting/Settings.robot @@ -486,7 +486,7 @@ CreateResponsePages sleep ${sleep_min} click id=sidebarProxy_Profiles #点击二级目录Proxy Profiles sleep ${sleep} - click id=respinseAdd #Response Pages点击Create + click id=responseAdd #Response Pages点击Create sleep ${sleep} input id=responsepages_profileName1 ${name} #输入name sleep ${sleep} @@ -1090,9 +1090,9 @@ SSLFingerprintImportJA3 sleep ${sleep_min} click id=objectImport sleep ${sleep} - Choose File xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div[1]/div/div[1]/div[2]/div[2]/div/div[1]/div/div/div[1]/div/form/div[1]/div/div/div[1]/input ${file} + Choose File xpath=/html/body/div[3]/div/div[1]/div/div/div[1]/div/form/div[1]/div/div/div[1]/input ${file} sleep ${sleep} - click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div[1]/div/div[1]/div[2]/div[2]/div/div[1]/div/div/div[1]/div/form/div[2]/div/button + click xpath=/html/body/div[3]/div/div[1]/div/div/div[1]/div/form/div[2]/div/button sleep ${sleep} @@ -2463,7 +2463,7 @@ UploadFilesSize ... AND sleep ${sleep_min} ... AND click id=sidebarProxy_Profiles #点击二级目录Proxy Profiles ... AND sleep ${sleep} - ... AND click id=respinseAdd #Response Pages点击Create + ... AND click id=responseAdd #Response Pages点击Create ... AND sleep ${sleep} ... AND input id=responsepages_profileName1 ${name} #输入name ... AND sleep ${sleep} @@ -2670,7 +2670,7 @@ ResponsrPageCreateAndEdit OpenPages sidebarProxy_Profiles profilesTabs_Profile_ResponsePages ${id} Get Text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/span run keyword if "${CreateOrEdit}" == "Create" run keywords sleep ${sleep_min} - ... AND click id=respinseAdd + ... AND click id=responseAdd ... AND sleep ${sleep} ... AND input id=responsepages_profileName1 ${Name} run keyword if "${CreateOrEdit}" == "Edit" run keywords sleep ${sleep_min} @@ -2696,7 +2696,7 @@ ResponsrPageCreateAndEdit ResponsrPageCreateAssert [Arguments] ${search} ${Name} ${id} - Wait Until Element Is Enabled id=respinseAdd ${sleep_Wait} + Wait Until Element Is Enabled id=responseAdd ${sleep_Wait} run keyword if "${search}"=="id" run keywords sleep ${sleep_min} ... AND Settings-Search ${id} ${search} #搜索框的关键字 ... ELSE IF "${search}"=="name" run keywords sleep ${sleep_min}