gfwleak/dongxiaoyan-tsg-autotest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

根据测试报告调整自动化代码

Browse Source
This commit is contained in:
byb11
2021-04-23 14:24:07 +08:00
parent 0df38e620a
commit 623e60fdeb
8 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
02-Keyword/tsg_ui/setting/Settings.robot
View File

@@ -463,6 +463,7 @@ EditInsertScripts
... AND click //span[.="${jstype}"]
sleep ${sleep_min}
click id=insertAddOk1 #点击ok提交
Wait Until Element Is Enabled id=insertAdd ${sleep_Wait}
run keyword if "${search}"=="id" run keywords sleep ${sleep_min}
... AND Settings-Search ${id-name} ${search} #搜索框的关键字
... ELSE IF "${search}"=="name" run keywords sleep ${sleep_min}
@@ -687,10 +688,10 @@ CreateDecryptionKeyrings
... ${PrivateKeyType}：私钥类型
#打开浏览器
#ui-login lyf 111111
sleep ${sleep_min}
sleep ${sleep}
click id=children6 #点击一级目录Settings
sleep ${sleep_min}
click id=sidebarProxy_CertificateManagement #点击二级目录Trusted Certificate Authorities
sleep ${sleep}
click id=sidebarProxy_CertificateManagement
sleep ${sleep}
click xpath=//*[@id="proxyTabs"]/div/ul/li[2] #点击Decryption Keyrings
sleep ${sleep_min}
@@ -1731,11 +1732,11 @@ Req_Res_Body
CreateIpLibraries
[Arguments] ${type1} ${type} ${Continent/Country} ${GeoNameID} ${City} ${ip} ${j}=1 ${Country}=null ${Longitude}=null ${Latitude}=null
sleep ${sleep_min}
sleep ${sleep}
click id=children6 #点击一级目录Settings
sleep ${sleep_min}
sleep ${sleep}
click id=sidebarAdvanced
sleep ${sleep_min}
sleep ${sleep}
click id=Advanced/ipLibrary #点击二级目录IP_Libraries
sleep ${sleep}
click id=tagAdd #点击Create按钮
@@ -2198,7 +2199,7 @@ Switch_Geographic_Locations
input id=objectName_seach ${Continent/Country}
sleep ${sleep_min}
press keys id=objectName_seach ENTER
sleep ${sleep}
sleep 3
click xpath=//*[@id="right_locationList"]/div[2]/div[1]/div[2]/div/div
sleep ${sleep_min}
click id=interceptionadd_allcancelobject9
@@ -2269,9 +2270,9 @@ OpenPages
... ${Three-levelMenu}：三级菜单
... ${Targeting} :三级菜单 定位方式 默认不输入为id
click id=children6
sleep ${sleep_min}
sleep ${sleep}
click id=${SecondaryMenu}
sleep ${sleep_min}
sleep ${sleep}
run keyword if "${Targeting}"=="null" run keywords sleep ${sleep_min}
... AND click id=${Three-levelMenu}
run keyword if "${Targeting}"=="xpath" run keywords sleep ${sleep_min}
@@ -2613,14 +2614,14 @@ 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[3]/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}" == "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}
click xpath=${button}${One}
sleep ${sleep}
${text2} get text xpath=${assert}
click xpath=${button}${Two}
click xpath=${button}${One}
sleep ${sleep}
${text3} get text xpath=${assert}
Should Not Be Equal ${text1} ${text2}