diff --git a/02-Keyword/tsg_ui/Setting/Settings.robot b/02-Keyword/tsg_ui/Setting/Settings.robot index 803f5f6..31f0d51 100644 --- a/02-Keyword/tsg_ui/Setting/Settings.robot +++ b/02-Keyword/tsg_ui/Setting/Settings.robot @@ -407,12 +407,6 @@ Search-Cached Intermediate Certificates ... ${type}:为搜索类型的元素(id或sni) ... ${enabled}:为enabled开启或关闭按钮的元素 Sleep 1 - click id=children5 #点击一级目录Settings - Sleep 1 - click id=sidebarProxy_CertificateManagement #点击二级目录Trusted Certificate Authorities - Sleep 2 - click xpath=//*[@id="proxyTabs"]/div/ul/li[4] #点击Cached Intermediate Certificates按钮 - Sleep 1 click id=one-input #点击搜索框 Sleep 1 click ${type} @@ -873,3 +867,48 @@ Delete sleep 2 click xpath=/html/body/div/div/div[3]/button[2] sleep 2 +<<<<<<< HEAD + +Policy_Verify + Sleep 1 + click id=children5 #点击一级目录Settings + Sleep 1 + click id=sidebarTrouble_shooting #点击二级目录Trouble Shooting + Sleep 2 + click id=Proxy_Profiles_Profile_ResponsePages #点击Policy Verify按钮 + Sleep 1 + ${Select-Test} Set Variable ${Select-Test1} + Run Keyword If "${Select-Test}"=="Security Policy Match" Run Keywords click xpath=//*[@id="app"]/div/div[3]/div/div/div[2]/div[1]/div[1]/div[1]/form/div[1]/div/div/div/span/span/i + ... AND sleep 1 + ... AND click xpath=/html/body/div[5]/div[1]/div[1]/ul/li[1] + ... ELSE IF "${Select-Test}"=="Proxy Policy Match" Run Keywords click xpath=//*[@id="app"]/div/div[3]/div/div/div[2]/div[1]/div[1]/div[1]/form/div[1]/div/div/div/span/span/i + ... AND sleep 1 + ... AND click xpath=/html/body/div[5]/div[1]/div[1]/ul/li[2] + ... ELSE log 错误 + ${Address-type} Set Variable ${Address-type1} + Run Keyword If "${Address-type}"=="v4" Run Keywords click xpath=//*[@id="app"]/div/div[3]/div/div/div[2]/div[1]/div[1]/div[1]/form/div[2]/div/div/div/span/span/i + ... AND sleep 1 + ... AND click xpath=/html/body/div[6]/div[1]/div[1]/ul/li[1] + ... ELSE IF "${Address-type}"=="v6" Run Keywords click xpath=//*[@id="app"]/div/div[3]/div/div/div[2]/div[1]/div[1]/div[1]/form/div[2]/div/div/div/span/span/i + ... AND sleep 1 + ... AND click xpath=/html/body/div[6]/div[1]/div[1]/ul/li[2] + ... ELSE log 错误 + input xpath=//*[@id="app"]/div/div[3]/div/div/div[2]/div[1]/div[1]/div[1]/form/div[3]/div/div/input ${Client-IP} + sleep 2 + input xpath=//*[@id="app"]/div/div[3]/div/div/div[2]/div[1]/div[1]/div[1]/form/div[4]/div/div/input ${Client-Port} + sleep 2 + input xpath=//*[@id="app"]/div/div[3]/div/div/div[2]/div[1]/div[1]/div[1]/form/div[5]/div/div/input ${Server-IP} + sleep 2 + input xpath=//*[@id="app"]/div/div[3]/div/div/div[2]/div[1]/div[1]/div[1]/form/div[6]/div/div/input ${Server-Port} + ${Protocol} Set Variable ${Protocol1} + Run Keyword If "${Protocol}"=="Any" Run Keywords click xpath=//*[@id="app"]/div/div[3]/div/div/div[2]/div[1]/div[1]/div[1]/form/div[7]/div/div/div/span/span/i + ... AND sleep 1 + ... AND click xpath=/html/body/div[7]/div[1]/div[1]/ul/li[1] + ... ELSE IF "${Protocol}"=="TCP" Run Keywords click xpath=//*[@id="app"]/div/div[3]/div/div/div[2]/div[1]/div[1]/div[1]/form/div[7]/div/div/div/span/span/i + ... AND sleep 1 + ... AND click xpath=/html/body/div[7]/div[1]/div[1]/ul/li[2] + ... ELSE IF "${Protocol}"=="UDP" Run Keywords click xpath=//*[@id="app"]/div/div[3]/div/div/div[2]/div[1]/div[1]/div[1]/form/div[7]/div/div/div/span/span/i + ... AND sleep 1 + ... AND click xpath=/html/body/div[7]/div[1]/div[1]/ul/li[2] +======= +>>>>>>> f1b3db9c57b4332c650f11402b50fed24271e105